diff options
| author | Jose <jose@zeroc.com> | 2020-12-18 20:48:36 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2020-12-18 20:48:36 +0100 |
| commit | e845866a042499616f7a26883817bda6b6d3c768 (patch) | |
| tree | d3c6afc84e4be3596eabd4b17181a361e9d4dddc /cpp | |
| parent | Fixed IceGridGUI bug where service metrics were missing (fixes #1203) (#1204) (diff) | |
| download | ice-e845866a042499616f7a26883817bda6b6d3c768.tar.bz2 ice-e845866a042499616f7a26883817bda6b6d3c768.tar.xz ice-e845866a042499616f7a26883817bda6b6d3c768.zip | |
Fix sporadic failures with IceGrid/activation test
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/IceGrid/activation/AllTests.cpp | 9 | ||||
| -rw-r--r-- | cpp/test/IceGrid/activation/application.xml | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/activation/test.py | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/cpp/test/IceGrid/activation/AllTests.cpp b/cpp/test/IceGrid/activation/AllTests.cpp index 152a3e38a6b..fbeda45eb40 100644 --- a/cpp/test/IceGrid/activation/AllTests.cpp +++ b/cpp/test/IceGrid/activation/AllTests.cpp @@ -628,11 +628,14 @@ allTests(Test::TestHelper* helper) try { obj->ice_ping(); - test(IceUtil::Time::now() - now >= IceUtil::Time::seconds(2)); + test(IceUtil::Time::now() - now >= IceUtil::Time::seconds(3)); } - catch(const Ice::NoEndpointException&) + catch (const Ice::NoEndpointException&) { - break; // Success + if (!admin->isServerEnabled("server2")) + { + break; // Success + } } } test(!admin->isServerEnabled("server2")); diff --git a/cpp/test/IceGrid/activation/application.xml b/cpp/test/IceGrid/activation/application.xml index ec5f24c7b5c..3365a019ce5 100644 --- a/cpp/test/IceGrid/activation/application.xml +++ b/cpp/test/IceGrid/activation/application.xml @@ -40,7 +40,7 @@ <node name="localnode"> <server-instance template="IceGridNode" id="node-1" disable-on-failure="-1"/> - <server-instance template="IceGridNode" id="node-2" disable-on-failure="2"/> + <server-instance template="IceGridNode" id="node-2" disable-on-failure="3"/> <server-instance template="Server" id="server"/> <server-instance template="Server" id="server-manual" activation="manual"/> diff --git a/cpp/test/IceGrid/activation/test.py b/cpp/test/IceGrid/activation/test.py index 89e334d3af3..d84f4c874b5 100644 --- a/cpp/test/IceGrid/activation/test.py +++ b/cpp/test/IceGrid/activation/test.py @@ -2,7 +2,8 @@ # # Copyright (c) ZeroC, Inc. All rights reserved. # -outfilters = [re.compile("warning: server activation failed"), +outfilters = [re.compile("cannot find the file specified"), + re.compile("warning: server activation failed"), re.compile("cannot execute"), re.compile("cannot change working directory")] |