diff options
author | Benoit Foucher <benoit@zeroc.com> | 2017-06-09 15:07:24 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-09 15:07:24 +0200 |
commit | 3b2724d7ac5891c243ced1ad3c49250dadfb8915 (patch) | |
tree | 8632ad80db26aac7289754119509ae3c971f4be4 | |
parent | Fixed ICE-7955 - AMI future callback exceptions are now reported with the logger (diff) | |
download | ice-3b2724d7ac5891c243ced1ad3c49250dadfb8915.tar.bz2 ice-3b2724d7ac5891c243ced1ad3c49250dadfb8915.tar.xz ice-3b2724d7ac5891c243ced1ad3c49250dadfb8915.zip |
Fix for ICE-7841 - increased retry count, minor binding test fix
-rw-r--r-- | cpp/test/Ice/binding/AllTests.cpp | 2 | ||||
-rw-r--r-- | cpp/test/IceStorm/stress/Subscriber.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp index 6bac52fa42c..bba35fac750 100644 --- a/cpp/test/Ice/binding/AllTests.cpp +++ b/cpp/test/Ice/binding/AllTests.cpp @@ -956,7 +956,7 @@ allTests(const Ice::CommunicatorPtr& communicator) anyboth->setProperty("Ice.IPv4", "1"); anyboth->setProperty("Ice.IPv6", "1"); anyboth->setProperty("Adapter.Endpoints", endpoint); - anyboth->setProperty("Adapter.PublishedEndpoints", endpoint + " -p 12012:" + endpoint + " -p 12012"); + anyboth->setProperty("Adapter.PublishedEndpoints", endpoint + " -h 127.0.0.1:" + endpoint + " -h \"::1\""); Ice::PropertiesPtr localipv4 = ipv4->clone(); localipv4->setProperty("Adapter.Endpoints", "tcp -h 127.0.0.1"); diff --git a/cpp/test/IceStorm/stress/Subscriber.cpp b/cpp/test/IceStorm/stress/Subscriber.cpp index 7f7832e8bd6..d20dced15f1 100644 --- a/cpp/test/IceStorm/stress/Subscriber.cpp +++ b/cpp/test/IceStorm/stress/Subscriber.cpp @@ -237,7 +237,7 @@ public: // check might be invoked before IceStorm got a chance to process the close connection // message from this subscriber, retry if the ice_ping still succeeds. // - int nRetry = 5; + int nRetry = 10; while(--nRetry > 0) { subscription.publisher->ice_ping(); |