diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-06-07 11:17:08 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-07 11:17:08 +0200 |
| commit | 9eb65b44504d2dc339de750af77a79fa7ec1678e (patch) | |
| tree | 4198a42009012f3d1f543b3466a8695449e2b2a1 /python/test | |
| parent | Fixed ICE-7980 - Ice/udp test failure (diff) | |
| download | ice-9eb65b44504d2dc339de750af77a79fa7ec1678e.tar.bz2 ice-9eb65b44504d2dc339de750af77a79fa7ec1678e.tar.xz ice-9eb65b44504d2dc339de750af77a79fa7ec1678e.zip | |
Fixed Python AMI test failure & improved Java test
Diffstat (limited to 'python/test')
| -rw-r--r-- | python/test/Ice/ami/AllTests.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/python/test/Ice/ami/AllTests.py b/python/test/Ice/ami/AllTests.py index 62cdf72abfd..5f58bdf038a 100644 --- a/python/test/Ice/ami/AllTests.py +++ b/python/test/Ice/ami/AllTests.py @@ -304,8 +304,10 @@ class FutureFlushCallback(CallbackBase): self._cookie = cookie def sent(self, f, sentSynchronously): - test((sentSynchronously and self._thread == threading.currentThread()) or \ - (not sentSynchronously and self._thread != threading.currentThread())) + self.called() + + def sentAsync(self, f, sentSynchronously): + test(self._thread != threading.currentThread()) self.called() class FutureFlushExCallback(CallbackBase): @@ -1553,6 +1555,7 @@ def allTestsFuture(communicator, collocated): cb = FutureFlushCallback() f = b1.ice_flushBatchRequestsAsync() f.add_sent_callback(cb.sent) + f.add_sent_callback_async(cb.sentAsync) cb.check() test(f.is_sent()) test(f.done()) |