diff options
author | Benoit Foucher <benoit@zeroc.com> | 2016-09-16 11:22:03 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2016-09-19 14:50:12 +0200 |
commit | 909675f8719fa76245727f681a8ab80f04041f95 (patch) | |
tree | d3f9a13fa561ee764e559a172f7b40b06836a119 | |
parent | Fix typo (diff) | |
download | ice-909675f8719fa76245727f681a8ab80f04041f95.tar.bz2 ice-909675f8719fa76245727f681a8ab80f04041f95.tar.xz ice-909675f8719fa76245727f681a8ab80f04041f95.zip |
Fixed ICE-7317 - timeout test failure
-rw-r--r-- | cpp/test/Ice/timeout/AllTests.cpp | 8 | ||||
-rw-r--r-- | csharp/test/Ice/timeout/AllTests.cs | 8 | ||||
-rw-r--r-- | java/test/src/main/java/test/Ice/timeout/AllTests.java | 6 | ||||
-rw-r--r-- | python/test/Ice/timeout/AllTests.py | 4 | ||||
-rw-r--r-- | ruby/test/Ice/timeout/AllTests.rb | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp index 62d5a8e728e..377cac568ef 100644 --- a/cpp/test/Ice/timeout/AllTests.cpp +++ b/cpp/test/Ice/timeout/AllTests.cpp @@ -385,10 +385,10 @@ allTests(const Ice::CommunicatorPtr& communicator) initData.properties->setProperty("Ice.Override.CloseTimeout", "250"); Ice::CommunicatorPtr comm = Ice::initialize(initData); Ice::ConnectionPtr connection = comm->stringToProxy(sref)->ice_getConnection(); - timeout->holdAdapter(500); + timeout->holdAdapter(800); IceUtil::Time now = IceUtil::Time::now(); comm->destroy(); - test(IceUtil::Time::now() - now < IceUtil::Time::milliSeconds(400)); + test(IceUtil::Time::now() - now < IceUtil::Time::milliSeconds(700)); } cout << "ok" << endl; @@ -403,7 +403,7 @@ allTests(const Ice::CommunicatorPtr& communicator) timeout = timeout->ice_invocationTimeout(100); try { - timeout->sleep(300); + timeout->sleep(500); test(false); } catch(const Ice::InvocationTimeoutException&) @@ -412,7 +412,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { - timeout->end_sleep(timeout->begin_sleep(300)); + timeout->end_sleep(timeout->begin_sleep(500)); test(false); } catch(const Ice::InvocationTimeoutException&) diff --git a/csharp/test/Ice/timeout/AllTests.cs b/csharp/test/Ice/timeout/AllTests.cs index 835f5768ec2..28d2fed0be9 100644 --- a/csharp/test/Ice/timeout/AllTests.cs +++ b/csharp/test/Ice/timeout/AllTests.cs @@ -405,10 +405,10 @@ public class AllTests : TestCommon.TestApp initData.properties.setProperty("Ice.Override.CloseTimeout", "100"); Ice.Communicator comm = Ice.Util.initialize(initData); comm.stringToProxy(sref).ice_getConnection(); - timeout.holdAdapter(500); + timeout.holdAdapter(800); long begin = System.DateTime.Now.Ticks; comm.destroy(); - test(((long)new System.TimeSpan(System.DateTime.Now.Ticks - begin).TotalMilliseconds - begin) < 400); + test(((long)new System.TimeSpan(System.DateTime.Now.Ticks - begin).TotalMilliseconds - begin) < 700); } WriteLine("ok"); @@ -424,7 +424,7 @@ public class AllTests : TestCommon.TestApp proxy = (Test.TimeoutPrx)proxy.ice_invocationTimeout(100); try { - proxy.sleep(300); + proxy.sleep(500); test(false); } catch(Ice.InvocationTimeoutException) @@ -433,7 +433,7 @@ public class AllTests : TestCommon.TestApp try { - proxy.end_sleep(proxy.begin_sleep(300)); + proxy.end_sleep(proxy.begin_sleep(500)); test(false); } catch(Ice.InvocationTimeoutException) diff --git a/java/test/src/main/java/test/Ice/timeout/AllTests.java b/java/test/src/main/java/test/Ice/timeout/AllTests.java index facbe176e24..d46cf1133fc 100644 --- a/java/test/src/main/java/test/Ice/timeout/AllTests.java +++ b/java/test/src/main/java/test/Ice/timeout/AllTests.java @@ -466,10 +466,10 @@ public class AllTests initData.properties.setProperty("Ice.Override.CloseTimeout", "100"); Ice.Communicator comm = app.initialize(initData); comm.stringToProxy(sref).ice_getConnection(); - timeout.holdAdapter(500); + timeout.holdAdapter(800); long now = System.nanoTime(); comm.destroy(); - test(System.nanoTime() - now < 400 * 1000000); + test(System.nanoTime() - now < 700 * 1000000); } out.println("ok"); @@ -485,7 +485,7 @@ public class AllTests proxy = (TimeoutPrx)proxy.ice_invocationTimeout(100); try { - proxy.sleep(300); + proxy.sleep(500); test(false); } catch(Ice.InvocationTimeoutException ex) diff --git a/python/test/Ice/timeout/AllTests.py b/python/test/Ice/timeout/AllTests.py index ea5e685dafe..fd90bdad679 100644 --- a/python/test/Ice/timeout/AllTests.py +++ b/python/test/Ice/timeout/AllTests.py @@ -248,10 +248,10 @@ def allTests(communicator): initData.properties.setProperty("Ice.Override.CloseTimeout", "100") comm = Ice.initialize(initData) connection = comm.stringToProxy(sref).ice_getConnection(); - timeout.holdAdapter(500); + timeout.holdAdapter(800); now = time.clock(); comm.destroy(); - test((time.clock() - now) < 0.4); + test((time.clock() - now) < 0.7); print("ok") diff --git a/ruby/test/Ice/timeout/AllTests.rb b/ruby/test/Ice/timeout/AllTests.rb index 72c717ae2a5..05746528fc6 100644 --- a/ruby/test/Ice/timeout/AllTests.rb +++ b/ruby/test/Ice/timeout/AllTests.rb @@ -198,10 +198,10 @@ def allTests(communicator) initData.properties.setProperty("Ice.Override.CloseTimeout", "100") comm = Ice.initialize(initData) connection = comm.stringToProxy(sref).ice_getConnection(); - timeout.holdAdapter(500); + timeout.holdAdapter(800); now = Time.now comm.destroy(); - test((Time.now - now) < 0.4); + test((Time.now - now) < 0.7); puts "ok" |