summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2019-09-26 13:36:41 +0200
committerBenoit Foucher <benoit@zeroc.com>2019-09-26 13:36:41 +0200
commit8fc5de194edb3be164195f85c0e4182115b601c8 (patch)
tree7f62a1cb42898aae397ebc4ac11210d341808927 /cpp/test
parenttarget netcoreapp2.1 with Visual Studio 2017 builds (diff)
downloadice-8fc5de194edb3be164195f85c0e4182115b601c8.tar.bz2
ice-8fc5de194edb3be164195f85c0e4182115b601c8.tar.xz
ice-8fc5de194edb3be164195f85c0e4182115b601c8.zip
Fixed IceLocatorDiscovery race condition, fixes #555
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/IceGrid/simple/AllTests.cpp20
1 files changed, 20 insertions, 0 deletions
diff --git a/cpp/test/IceGrid/simple/AllTests.cpp b/cpp/test/IceGrid/simple/AllTests.cpp
index 037d5627447..8ac52b2b58a 100644
--- a/cpp/test/IceGrid/simple/AllTests.cpp
+++ b/cpp/test/IceGrid/simple/AllTests.cpp
@@ -165,6 +165,26 @@ allTests(Test::TestHelper* helper)
initData.properties = communicator->getProperties()->clone();
initData.properties->setProperty("Ice.Default.Locator", "");
+ initData.properties->setProperty("IceLocatorDiscovery.RetryCount", "0");
+ initData.properties->setProperty("Ice.Plugin.IceLocatorDiscovery",
+ "IceLocatorDiscovery:createIceLocatorDiscovery");
+ initData.properties->setProperty("IceLocatorDiscovery.Lookup",
+ "udp -h " + multicast + " --interface unknown");
+ com = Ice::initialize(initData);
+ test(com->getDefaultLocator());
+ try
+ {
+ com->stringToProxy("test @ TestAdapter")->ice_ping();
+ test(false);
+ }
+ catch(const Ice::NoEndpointException&)
+ {
+ }
+ com->destroy();
+
+ initData.properties = communicator->getProperties()->clone();
+ initData.properties->setProperty("Ice.Default.Locator", "");
+ initData.properties->setProperty("IceLocatorDiscovery.RetryCount", "1");
initData.properties->setProperty("Ice.Plugin.IceLocatorDiscovery",
"IceLocatorDiscovery:createIceLocatorDiscovery");
{