summaryrefslogtreecommitdiff
path: root/python/test
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-06-09 13:27:37 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-06-09 13:27:37 +0200
commit3d02c1f1b3f8db5200eed4c31c4727c0a2906b61 (patch)
tree226d41b4bc01df6dd7b82e36bb48e6c38a4ae9ad /python/test
parentFix for ICE-7993 - Ice/binding test failures (diff)
downloadice-3d02c1f1b3f8db5200eed4c31c4727c0a2906b61.tar.bz2
ice-3d02c1f1b3f8db5200eed4c31c4727c0a2906b61.tar.xz
ice-3d02c1f1b3f8db5200eed4c31c4727c0a2906b61.zip
Fixed ICE-7955 - AMI future callback exceptions are now reported with the logger
Diffstat (limited to 'python/test')
-rw-r--r--python/test/Ice/ami/AllTests.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/python/test/Ice/ami/AllTests.py b/python/test/Ice/ami/AllTests.py
index 5f58bdf038a..83727dd1d55 100644
--- a/python/test/Ice/ami/AllTests.py
+++ b/python/test/Ice/ami/AllTests.py
@@ -7,7 +7,7 @@
#
# **********************************************************************
-import Ice, Test, sys, threading, random, logging
+import Ice, Test, sys, threading, random
def test(b):
if not b:
@@ -377,11 +377,6 @@ class Thrower(CallbackBase):
throwEx(self._t)
def allTests(communicator, collocated):
- # Ice.Future uses the Python logging facility, this tests throws exceptions from Ice.Future callbacks
- # so we disable errors to prevent them to show up on the console.
- logging.basicConfig()
- logging.disable(logging.ERROR)
-
sref = "test:default -p 12010"
obj = communicator.stringToProxy(sref)
test(obj)
@@ -774,7 +769,7 @@ def allTests(communicator, collocated):
throwEx(t)
except Exception as ex2:
test(type(ex) == type(ex2))
- f.add_sent_callback_async(throwerEx)
+ f.add_sent_callback_async(lambda f, s: throwEx(f))
f.result()
p.begin_op(lambda: cb.noOpWC(cookie), lambda ex: cb.exWC(ex, cookie), lambda ss: cb.sentWC(ss, cookie))