summaryrefslogtreecommitdiff
path: root/python/test
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2018-06-21 09:20:02 +0200
committerBenoit Foucher <benoit@zeroc.com>2018-06-21 09:20:02 +0200
commit4bd01c81331ea7cd3f733a363c1be2ecd6805c85 (patch)
treee9b90e579f0dd659f84dced51dc48656bf5744d4 /python/test
parentFixed Android >= 8.0 SSL issue (fixes #105 (diff)
downloadice-4bd01c81331ea7cd3f733a363c1be2ecd6805c85.tar.bz2
ice-4bd01c81331ea7cd3f733a363c1be2ecd6805c85.tar.xz
ice-4bd01c81331ea7cd3f733a363c1be2ecd6805c85.zip
Test fixes and improvements for Android testing reliability
Diffstat (limited to 'python/test')
-rw-r--r--python/test/Ice/dispatcher/AllTests.py2
-rw-r--r--python/test/Ice/timeout/AllTests.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/python/test/Ice/dispatcher/AllTests.py b/python/test/Ice/dispatcher/AllTests.py
index 2d692204cdd..797c06ec051 100644
--- a/python/test/Ice/dispatcher/AllTests.py
+++ b/python/test/Ice/dispatcher/AllTests.py
@@ -84,7 +84,7 @@ def allTests(communicator, collocated):
#
# Expect InvocationTimeoutException.
#
- to = p.ice_invocationTimeout(250);
+ to = p.ice_invocationTimeout(10);
to.sleepAsync(500).add_done_callback_async(cb.exceptionEx)
cb.check()
diff --git a/python/test/Ice/timeout/AllTests.py b/python/test/Ice/timeout/AllTests.py
index b142769e5ab..c18f559bfb6 100644
--- a/python/test/Ice/timeout/AllTests.py
+++ b/python/test/Ice/timeout/AllTests.py
@@ -286,7 +286,7 @@ def allTests(communicator):
controller.holdAdapter(-1)
now = time.clock()
comm.destroy()
- test((time.clock() - now) < 0.7)
+ test((time.clock() - now) < 1.0)
controller.resumeAdapter()
print("ok")