diff options
Diffstat (limited to 'cpp/test/IceGrid/session/AllTests.cpp')
| -rw-r--r-- | cpp/test/IceGrid/session/AllTests.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index e40196c5a06..21487bd237b 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -1387,11 +1387,8 @@ allTests(const Ice::CommunicatorPtr& communicator) } session2->destroy(); - adpt1->deactivate(); - adpt2->deactivate(); - - adpt1->waitForDeactivate(); - adpt2->waitForDeactivate(); + adpt1->destroy(); + adpt2->destroy(); // // TODO: test session reaping? @@ -1490,8 +1487,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } session1->destroy(); - adpt1->deactivate(); - adpt1->waitForDeactivate(); + adpt1->destroy(); cout << "ok" << endl; } @@ -1575,8 +1571,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } session1->destroy(); - adpt1->deactivate(); - adpt1->waitForDeactivate(); + adpt1->destroy(); cout << "ok" << endl; } @@ -1630,8 +1625,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } session1->destroy(); - adpt1->deactivate(); - adpt1->waitForDeactivate(); + adpt1->destroy(); cout << "ok" << endl; } @@ -1743,8 +1737,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // nodeObs1->waitForUpdate(__FILE__, __LINE__); // serverUpdate(Destroyed) // session1->destroy(); -// adpt1->deactivate(); -// adpt1->waitForDeactivate(); +// adpt1->destroy(); // cout << "ok" << endl; } |