Additional connect timeout test (#2716)

zeroc-ice · Sep 4, 2024 · b1afb78 · b1afb78
1 parent e7fe6bc
commit b1afb78
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 6 deletions.
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp
@@ -56,15 +56,26 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrx& controller
         controller->holdAdapter(-1);
         try
         {
-            timeout->op();
+            timeout->ice_connectionId("connection-1")->op();
+            test(false);
+        }
+        catch (const Ice::ConnectTimeoutException&)
+        {
+            // Expected.
+        }
+
+        try
+        {
+            timeout->ice_connectionId("connection-2")->op();
             test(false);
         }
         catch (const Ice::ConnectTimeoutException&)
         {
             // Expected.
         }
         controller->resumeAdapter();
-        timeout->op(); // Ensure adapter is active.
+        // Retrying with a new connection.
+        timeout->ice_connectionId("connection-3")->op();
     }
     {
         //

diff --git a/csharp/test/Ice/timeout/AllTests.cs b/csharp/test/Ice/timeout/AllTests.cs
@@ -61,15 +61,30 @@ public static async Task allTestsWithController(global::Test.TestHelper helper,
             controller.holdAdapter(-1);
             try
             {
-                timeout.op();
+                Test.TimeoutPrxHelper.uncheckedCast(timeout.ice_connectionId("connection-1")).op();
                 test(false);
             }
             catch (ConnectTimeoutException)
             {
                 // Expected.
             }
+
+            if (!Ice.Internal.AssemblyUtil.isMacOS)
+            {
+                // Workaround for macOS bug
+                // See: https://github.com/dotnet/runtime/issues/102663
+                try
+                {
+                    Test.TimeoutPrxHelper.uncheckedCast(timeout.ice_connectionId("connection-2")).op();
+                    test(false);
+                }
+                catch (ConnectTimeoutException)
+                {
+                    // Expected.
+                }
+            }
             controller.resumeAdapter();
-            timeout.op(); // Ensure adapter is active.
+            Test.TimeoutPrxHelper.uncheckedCast(timeout.ice_connectionId("connection-3")).op(); // Ensure adapter is active.
         }
         {
             //

diff --git a/java/test/src/main/java/test/Ice/timeout/AllTests.java b/java/test/src/main/java/test/Ice/timeout/AllTests.java
@@ -50,13 +50,21 @@ public static void allTestsWithController(test.TestHelper helper, ControllerPrx
       //
       controller.holdAdapter(-1);
       try {
-        timeout.op();
+        TimeoutPrx.uncheckedCast(timeout.ice_connectionId("connection-1")).op();
+        test(false);
+      } catch (com.zeroc.Ice.ConnectTimeoutException ex) {
+        // Expected.
+      }
+
+      try {
+        TimeoutPrx.uncheckedCast(timeout.ice_connectionId("connection-2")).op();
         test(false);
       } catch (com.zeroc.Ice.ConnectTimeoutException ex) {
         // Expected.
       }
       controller.resumeAdapter();
-      timeout.op(); // Ensure adapter is active.
+      // Retrying with a new connection.
+      TimeoutPrx.uncheckedCast(timeout.ice_connectionId("connection-3")).op();
     }
     {
       //