diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-09-14 15:43:34 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-09-14 15:43:34 +0200 |
| commit | 13bed6dec104b53fadf723aead0dc15dc3f2afd8 (patch) | |
| tree | d6401dbe7d70d65e04e448439e4056c1fa4d7e8c /ruby | |
| parent | Removed ARM configuraton from WinRT testsuite solutions (diff) | |
| download | ice-13bed6dec104b53fadf723aead0dc15dc3f2afd8.tar.bz2 ice-13bed6dec104b53fadf723aead0dc15dc3f2afd8.tar.xz ice-13bed6dec104b53fadf723aead0dc15dc3f2afd8.zip | |
Fixed ICE-6812 - JavaScript ACM monitor bug
Diffstat (limited to 'ruby')
| -rw-r--r-- | ruby/test/Ice/acm/AllTests.rb | 10 | ||||
| -rw-r--r-- | ruby/test/Ice/acm/Test.ice | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ruby/test/Ice/acm/AllTests.rb b/ruby/test/Ice/acm/AllTests.rb index 3e64c2c3420..ba100d864d8 100644 --- a/ruby/test/Ice/acm/AllTests.rb +++ b/ruby/test/Ice/acm/AllTests.rb @@ -37,12 +37,14 @@ def allTests(communicator) test(acm.close == Ice::ACMClose::CloseOnIdleForceful) test(acm.heartbeat == Ice::ACMHeartbeat::HeartbeatOnIdle) - proxy.ice_getCachedConnection().setACM(20, Ice::ACMClose::CloseOnInvocationAndIdle, - Ice::ACMHeartbeat::HeartbeatOnInvocation) + proxy.ice_getCachedConnection().setACM(1, Ice::ACMClose::CloseOnInvocationAndIdle, + Ice::ACMHeartbeat::HeartbeatAlways) acm = proxy.ice_getCachedConnection().getACM() - test(acm.timeout == 20) + test(acm.timeout == 1) test(acm.close == Ice::ACMClose::CloseOnInvocationAndIdle) - test(acm.heartbeat == Ice::ACMHeartbeat::HeartbeatOnInvocation) + test(acm.heartbeat == Ice::ACMHeartbeat::HeartbeatAlways) + + proxy.waitForHeartbeat(2) adapter.deactivate() testCommunicator.destroy() diff --git a/ruby/test/Ice/acm/Test.ice b/ruby/test/Ice/acm/Test.ice index b1c8b749109..0c4c3b105ca 100644 --- a/ruby/test/Ice/acm/Test.ice +++ b/ruby/test/Ice/acm/Test.ice @@ -17,6 +17,7 @@ interface TestIntf void sleep(int seconds); void sleepAndHold(int seconds); void interruptSleep(); + void waitForHeartbeat(int count); }; interface RemoteObjectAdapter |