Fixed Ice/timeout test to ensure the client doesn't hang in case of test failure

1 files changed, 14 insertions, 4 deletions

diff --git a/ruby/test/Ice/timeout/AllTests.rb b/ruby/test/Ice/timeout/AllTests.rb
index 37898d0c7ff..24636c98ded 100644
--- a/ruby/test/Ice/timeout/AllTests.rb
+++ b/ruby/test/Ice/timeout/AllTests.rb
@@ -17,6 +17,20 @@ def connect(prx)
 end
 
 def allTests(helper, communicator)
+    controller = Test::ControllerPrx::checkedCast(
+        communicator.stringToProxy("controller:#{helper.getTestEndpoint(num:1)}"))
+    test(controller)
+    begin
+        allTestsWithController(helper, communicator, controller)
+    rescue
+        # Ensure the adapter is not in the holding state when an unexpected exception occurs to prevent
+        # the test from hanging on exit in case a connection which disables timeouts is still opened.
+        controller.holdAdapter()
+        raise
+    end
+end
+
+def allTestsWithController(helper, communicator, controller)
     sref = "timeout:#{helper.getTestEndpoint()}"
     obj = communicator.stringToProxy(sref)
     test(obj)
@@ -24,10 +38,6 @@ def allTests(helper, communicator)
     timeout = Test::TimeoutPrx::checkedCast(obj)
     test(timeout)
 
-    controller = Test::ControllerPrx::checkedCast(
-        communicator.stringToProxy("controller:#{helper.getTestEndpoint(num:1)}"))
-    test(controller)
-
     print "testing connect timeout... "
     STDOUT.flush
     #