summaryrefslogtreecommitdiff
path: root/python/test/Ice/timeout/Client.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-09-15 12:18:41 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-09-15 12:18:41 +0200
commita4fb9c391caabef6de9cfbd126f4fe10755ece49 (patch)
tree36dfe5b0a110dddd09f49882649d8c2de825f4b4 /python/test/Ice/timeout/Client.py
parentRemoved Eclipse .launch files (diff)
downloadice-a4fb9c391caabef6de9cfbd126f4fe10755ece49.tar.bz2
ice-a4fb9c391caabef6de9cfbd126f4fe10755ece49.tar.xz
ice-a4fb9c391caabef6de9cfbd126f4fe10755ece49.zip
Fixed timeout tests to be less time sensitive
The tests now use a controller to hold/activate the adapter instead of relying on a timer. Fixes ICE-8312.
Diffstat (limited to 'python/test/Ice/timeout/Client.py')
-rwxr-xr-xpython/test/Ice/timeout/Client.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/python/test/Ice/timeout/Client.py b/python/test/Ice/timeout/Client.py
index 9d6bd83e625..31ecdc34d09 100755
--- a/python/test/Ice/timeout/Client.py
+++ b/python/test/Ice/timeout/Client.py
@@ -23,9 +23,7 @@ def test(b):
raise RuntimeError('test assertion failed')
def run(args, communicator):
- timeout = AllTests.allTests(communicator)
- timeout.shutdown()
-
+ AllTests.allTests(communicator)
return True
try: