summaryrefslogtreecommitdiff
path: root/python/test
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-06-03 22:27:28 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-06-03 22:27:28 +0200
commit73b1b723d892192d29f735237fc2caaf0c487af0 (patch)
tree23b5bbf648beaa86a6085cf7ebea1cb96edb9c0b /python/test
parentRemoved custom search path for symbols (diff)
downloadice-73b1b723d892192d29f735237fc2caaf0c487af0.tar.bz2
ice-73b1b723d892192d29f735237fc2caaf0c487af0.tar.xz
ice-73b1b723d892192d29f735237fc2caaf0c487af0.zip
Fixed python ami test failure and add add_sent_callback_async (ICE-7948)
Diffstat (limited to 'python/test')
-rw-r--r--python/test/Ice/ami/AllTests.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/python/test/Ice/ami/AllTests.py b/python/test/Ice/ami/AllTests.py
index 56ee2985458..0988092d429 100644
--- a/python/test/Ice/ami/AllTests.py
+++ b/python/test/Ice/ami/AllTests.py
@@ -720,7 +720,13 @@ def allTests(communicator, collocated):
test(false)
throwEx(t)
f = p.opAsync()
- f.add_done_callback(thrower)
+ try:
+ f.add_done_callback(thrower)
+ except Exception as ex:
+ try:
+ throwEx(t)
+ except Exception as ex2:
+ test(type(ex) == type(ex2))
f.add_done_callback_async(thrower)
f.result()
@@ -764,7 +770,7 @@ def allTests(communicator, collocated):
throwEx(t)
except Exception as ex2:
test(type(ex) == type(ex2))
- #f.add_sent_callback_async(throwerSent)
+ f.add_sent_callback_async(throwerEx)
f.result()
p.begin_op(lambda: cb.noOpWC(cookie), lambda ex: cb.exWC(ex, cookie), lambda ss: cb.sentWC(ss, cookie))