summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-12-11 10:34:07 +0100
committerBenoit Foucher <benoit@zeroc.com>2014-12-11 10:34:07 +0100
commit91c748259a7c7e54f54dd8d391bc3a66df17acbf (patch)
tree7f8ca32d3c24bfd9004ef5080c8365a01ac3c90d /cpp
parentMultiple Android demo bug fixes becase they're related (diff)
downloadice-91c748259a7c7e54f54dd8d391bc3a66df17acbf.tar.bz2
ice-91c748259a7c7e54f54dd8d391bc3a66df17acbf.tar.xz
ice-91c748259a7c7e54f54dd8d391bc3a66df17acbf.zip
Fix for ICE-6121, timeout test failure
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/Ice/timeout/AllTests.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp
index 79baab1f1a1..75e0c7b3515 100644
--- a/cpp/test/Ice/timeout/AllTests.cpp
+++ b/cpp/test/Ice/timeout/AllTests.cpp
@@ -171,12 +171,13 @@ allTests(const Ice::CommunicatorPtr& communicator)
test(connection == to->ice_getConnection());
try
{
- to->sleep(500);
+ to->sleep(750);
test(false);
}
catch(const Ice::InvocationTimeoutException&)
{
}
+ obj->ice_ping();
to = TimeoutPrx::checkedCast(obj->ice_invocationTimeout(500));
test(connection == to->ice_getConnection());
try
@@ -195,8 +196,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
//
TimeoutPrx to = TimeoutPrx::uncheckedCast(obj->ice_invocationTimeout(100));
CallbackPtr cb = new Callback();
- to->begin_sleep(500, newCallback_Timeout_sleep(cb, &Callback::responseEx, &Callback::exceptionEx));
+ to->begin_sleep(750, newCallback_Timeout_sleep(cb, &Callback::responseEx, &Callback::exceptionEx));
cb->check();
+ obj->ice_ping();
}
{
//
@@ -216,7 +218,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
try
{
con = to->ice_getConnection();
- to->sleep(500);
+ to->sleep(750);
test(false);
}
catch(const Ice::TimeoutException&)
@@ -231,11 +233,12 @@ allTests(const Ice::CommunicatorPtr& communicator)
// Connection got closed as well.
}
}
+ obj->ice_ping();
try
{
con = to->ice_getConnection();
- to->end_sleep(to->begin_sleep(500));
+ to->end_sleep(to->begin_sleep(750));
test(false);
}
catch(const Ice::TimeoutException&)
@@ -250,6 +253,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
// Connection got closed as well.
}
}
+ obj->ice_ping();
}
cout << "ok" << endl;