diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2019-09-04 15:12:56 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-09-04 15:12:56 +0200 |
| commit | 7b498dd62dde372cdc586e94c9a98c3ec89157b6 (patch) | |
| tree | 3bc3d853a0aa76bb1526b6b212a7629326c5e6bf /java | |
| parent | Fixed Ice/retry test timing (diff) | |
| download | ice-7b498dd62dde372cdc586e94c9a98c3ec89157b6.tar.bz2 ice-7b498dd62dde372cdc586e94c9a98c3ec89157b6.tar.xz ice-7b498dd62dde372cdc586e94c9a98c3ec89157b6.zip | |
Fixed Ice/acm test waitForClose timing
Diffstat (limited to 'java')
| -rw-r--r-- | java/test/src/main/java/test/Ice/acm/AllTests.java | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/java/test/src/main/java/test/Ice/acm/AllTests.java b/java/test/src/main/java/test/Ice/acm/AllTests.java index 64921b3fe6c..7f15c314d52 100644 --- a/java/test/src/main/java/test/Ice/acm/AllTests.java +++ b/java/test/src/main/java/test/Ice/acm/AllTests.java @@ -237,10 +237,10 @@ public class AllTests long now = com.zeroc.IceInternal.Time.currentMonotonicTimeMillis(); try { - wait(2000); - if(com.zeroc.IceInternal.Time.currentMonotonicTimeMillis() - now > 2000) + wait(30000); + if(com.zeroc.IceInternal.Time.currentMonotonicTimeMillis() - now > 30000) { - test(false); // Waited for more than 2s for close, something's wrong. + test(false); // Waited for more than 30s for close, something's wrong. } } catch(java.lang.InterruptedException ex) @@ -370,8 +370,7 @@ public class AllTests public void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy) { - // No close on invocation, the call should succeed this - // time. + // No close on invocation, the call should succeed this time. proxy.sleep(3); synchronized(this) @@ -392,16 +391,7 @@ public class AllTests public void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy) { - try - { - Thread.sleep(3000); // Idle for 3 seconds - } - catch(java.lang.InterruptedException ex) - { - } - waitForClosed(); - synchronized(this) { test(_heartbeat == 0); @@ -466,14 +456,6 @@ public class AllTests } adapter.activate(); - try - { - Thread.sleep(1000); - } - catch(java.lang.InterruptedException ex) - { - } - waitForClosed(); } } @@ -489,13 +471,6 @@ public class AllTests public void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy) { adapter.hold(); - try - { - Thread.sleep(3000); // Idle for 3 seconds - } - catch(java.lang.InterruptedException ex) - { - } waitForClosed(); synchronized(this) { |