diff options
Diffstat (limited to 'cpp/test/IceGrid/replicaGroup/AllTests.cpp')
| -rw-r--r-- | cpp/test/IceGrid/replicaGroup/AllTests.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cpp/test/IceGrid/replicaGroup/AllTests.cpp b/cpp/test/IceGrid/replicaGroup/AllTests.cpp index 2484c62dc1f..e91f9712561 100644 --- a/cpp/test/IceGrid/replicaGroup/AllTests.cpp +++ b/cpp/test/IceGrid/replicaGroup/AllTests.cpp @@ -118,6 +118,7 @@ removeServer(const AdminPrx& admin, const string& id) { try { + admin->enableServer(id, false); // Makes sure the server isn't activated on-demand after the stop. admin->stopServer(id); } catch(const ServerStopException&) @@ -234,6 +235,9 @@ allTests(const Ice::CommunicatorPtr& comm) obj = TestIntfPrx::uncheckedCast(obj->ice_connectionCached(false)); try { +#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) + IceUtil::DummyBCC dummy; +#endif test(obj->getReplicaIdAndShutdown() == "Server1.ReplicatedAdapter"); test(obj->getReplicaIdAndShutdown() == "Server2.ReplicatedAdapter"); test(obj->getReplicaIdAndShutdown() == "Server3.ReplicatedAdapter"); @@ -244,6 +248,9 @@ allTests(const Ice::CommunicatorPtr& comm) try { +#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) + IceUtil::DummyBCC dummy; +#endif obj->getReplicaId(); test(false); } @@ -411,6 +418,9 @@ allTests(const Ice::CommunicatorPtr& comm) try { +#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) + IceUtil::DummyBCC dummy; +#endif obj->getReplicaId(); test(false); } |