diff options
| -rw-r--r-- | cpp/test/IceGrid/replicaGroup/AllTests.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/replicaGroup/Makefile.mak | 4 | ||||
| -rw-r--r-- | cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/cpp/test/IceGrid/replicaGroup/AllTests.cpp b/cpp/test/IceGrid/replicaGroup/AllTests.cpp index 0ab597a108c..4242618ec0f 100644 --- a/cpp/test/IceGrid/replicaGroup/AllTests.cpp +++ b/cpp/test/IceGrid/replicaGroup/AllTests.cpp @@ -539,8 +539,6 @@ allTests(const Ice::CommunicatorPtr& comm) instantiateServer(admin, "Server", "localnode", params); params["id"] = "Server2"; instantiateServer(admin, "Server", "localnode", params); -// params["id"] = "Server3"; -// instantiateServer(admin, "Server", "localnode", params); params["id"] = "Server3"; instantiateServer(admin, "IceBox1", "localnode", params); diff --git a/cpp/test/IceGrid/replicaGroup/Makefile.mak b/cpp/test/IceGrid/replicaGroup/Makefile.mak index a8f9887ef95..baa61268242 100644 --- a/cpp/test/IceGrid/replicaGroup/Makefile.mak +++ b/cpp/test/IceGrid/replicaGroup/Makefile.mak @@ -15,8 +15,8 @@ SERVER = server.exe LIBNAME = testservice$(LIBSUFFIX).lib DLLNAME = testservice$(LIBSUFFIX).dll -PLUGINLIBNAME = registryplugin$(LIBSUFFIX).lib -PLUGINDLLNAME = registryplugin$(LIBSUFFIX).dll +PLUGINLIBNAME = registryplugin$(SOVERSION)$(LIBSUFFIX).lib +PLUGINDLLNAME = registryplugin$(SOVERSION)$(LIBSUFFIX).dll TARGETS = $(CLIENT) $(SERVER) $(LIBNAME) $(DLLNAME) $(PLUGINLIBNAME) $(PLUGINDLLNAME) diff --git a/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp b/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp index 132ba297abf..188adff6c45 100644 --- a/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp +++ b/cpp/test/IceGrid/replicaGroup/RegistryPlugin.cpp @@ -53,7 +53,7 @@ public: test(_facade->getApplicationInfo(_facade->getAdapterApplication(*p)).descriptor.name == "Test"); test(_facade->getServerInfo(_facade->getAdapterServer(*p)).application == "Test"); test(_facade->getNodeInfo(_facade->getAdapterNode(*p)).name == "localnode"); - test(_facade->getNodeLoad(_facade->getAdapterNode(*p)).avg1 > 0.0); + test(_facade->getNodeLoad(_facade->getAdapterNode(*p)).avg1 >= 0.0); test(_facade->getAdapterInfo(*p)[0].replicaGroupId == id); test(_facade->getPropertyForAdapter(*p, "Identity") == id); } |