diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-09-29 13:37:23 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-09-29 13:37:23 +0000 |
| commit | 5417605aa88e9019997ca50b4ad7692bedc09fc5 (patch) | |
| tree | 5c2df2f7eb277606f02919009f68f8a55cec91f7 /cpp/test | |
| parent | Fixed windows compile error (diff) | |
| download | ice-5417605aa88e9019997ca50b4ad7692bedc09fc5.tar.bz2 ice-5417605aa88e9019997ca50b4ad7692bedc09fc5.tar.xz ice-5417605aa88e9019997ca50b4ad7692bedc09fc5.zip | |
Added back support for --deploy option. Locking the registry isn't required
anymore to update the database.
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/IceGrid/activation/AllTests.cpp | 7 | ||||
| -rw-r--r-- | cpp/test/IceGrid/session/AllTests.cpp | 24 |
2 files changed, 20 insertions, 11 deletions
diff --git a/cpp/test/IceGrid/activation/AllTests.cpp b/cpp/test/IceGrid/activation/AllTests.cpp index 4a4303c6a53..6124a94daf2 100644 --- a/cpp/test/IceGrid/activation/AllTests.cpp +++ b/cpp/test/IceGrid/activation/AllTests.cpp @@ -25,7 +25,12 @@ waitForServerState(const IceGrid::AdminPrx& admin, const std::string& server, Ic IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(500)); ++nRetry; } - test(admin->getServerState(server) == state); + if(admin->getServerState(server) != state) + { + cerr << "server state change timed out:" << endl; + cerr << "server: " << server << endl; + cerr << "state: " << state << endl; + } } class PingThread : public IceUtil::Thread, IceUtil::Monitor<IceUtil::Mutex> diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp index 6e5d6c8c00a..7234d01584c 100644 --- a/cpp/test/IceGrid/session/AllTests.cpp +++ b/cpp/test/IceGrid/session/AllTests.cpp @@ -1330,16 +1330,20 @@ allTests(const Ice::CommunicatorPtr& communicator) test(serial + 1 == appObs2->serial); ++serial; - try - { - ApplicationUpdateDescriptor update; - update.name = "Application"; - admin1->updateApplication(update); - test(false); - } - catch(const AccessDeniedException&) - { - } + // + // We now allow modifying the database without holding the + // exclusive lock. + // +// try +// { +// ApplicationUpdateDescriptor update; +// update.name = "Application"; +// admin1->updateApplication(update); +// test(false); +// } +// catch(const AccessDeniedException&) +// { +// } try { |