diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-09-28 10:58:38 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-09-28 10:58:38 +0200 |
| commit | 8fc4ec400df8d0c1b2419ca40562a2392cbc8294 (patch) | |
| tree | c8dd0f8111caff483adaace3b87e5dec307ee9ad /java/test | |
| parent | Fixed test compilation failure with ARC (diff) | |
| download | ice-8fc4ec400df8d0c1b2419ca40562a2392cbc8294.tar.bz2 ice-8fc4ec400df8d0c1b2419ca40562a2392cbc8294.tar.xz ice-8fc4ec400df8d0c1b2419ca40562a2392cbc8294.zip | |
Fixed ICE-6824 - timeout test failure on SLES12
Diffstat (limited to 'java/test')
| -rw-r--r-- | java/test/src/main/java/test/Ice/timeout/AllTests.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/java/test/src/main/java/test/Ice/timeout/AllTests.java b/java/test/src/main/java/test/Ice/timeout/AllTests.java index 5aabc4ff255..b0c8abbca4d 100644 --- a/java/test/src/main/java/test/Ice/timeout/AllTests.java +++ b/java/test/src/main/java/test/Ice/timeout/AllTests.java @@ -403,7 +403,14 @@ public class AllTests // Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); - initData.properties.setProperty("Ice.Override.ConnectTimeout", "250"); + if(mult == 1) + { + initData.properties.setProperty("Ice.Override.ConnectTimeout", "250"); + } + else + { + initData.properties.setProperty("Ice.Override.ConnectTimeout", "2500"); + } Ice.Communicator comm = app.initialize(initData); TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(comm.stringToProxy(sref)); @@ -436,7 +443,7 @@ public class AllTests // Verify that timeout set via ice_timeout() is still used for requests. // timeout.op(); // Ensure adapter is active. - to = TimeoutPrxHelper.uncheckedCast(to.ice_timeout(100)); + to = TimeoutPrxHelper.uncheckedCast(to.ice_timeout(250)); to.ice_getConnection(); // Establish connection timeout.holdAdapter(750 * mult); try @@ -514,7 +521,7 @@ public class AllTests batchTimeout.ice_ping(); batchTimeout.ice_ping(); batchTimeout.ice_ping(); - + ((TimeoutPrx)proxy.ice_invocationTimeout(-1)).begin_sleep(300); // Keep the server thread pool busy. try { |