Speed up test

zeroc-ice · Apr 10, 2024 · e9ecde7 · e9ecde7
1 parent fd1b5eb
commit e9ecde7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp
@@ -53,11 +53,10 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrx& controller
         //
         // Expect ConnectTimeoutException.
         //
-        TimeoutPrx to = timeout->ice_timeout(100);
         controller->holdAdapter(-1);
         try
         {
-            to->op();
+            timeout->op();
             test(false);
         }
         catch (const Ice::ConnectTimeoutException&)
@@ -71,7 +70,12 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrx& controller
         //
         // Expect success.
         //
-        TimeoutPrx to = timeout->ice_timeout(-1);
+        Ice::InitializationData initData;
+        initData.properties = communicator->getProperties()->clone();
+        initData.properties->setProperty("Ice.ConnectTimeout", "-1");
+        Ice::CommunicatorHolder ich(initData);
+
+        TimeoutPrx to(ich.communicator(), sref);
         controller->holdAdapter(100);
         try
         {
@@ -235,8 +239,7 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrx& controller
 
     cout << "testing close timeout... " << flush;
     {
-        TimeoutPrx to = timeout->ice_timeout(250);
-        Ice::ConnectionPtr connection = connect(to);
+        Ice::ConnectionPtr connection = connect(timeout);
         controller->holdAdapter(-1);
         connection->close(Ice::ConnectionClose::GracefullyWithWait);
         try
@@ -266,7 +269,7 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrx& controller
     }
     cout << "ok" << endl;
 
-    // TODO: temporary. Replace by new test for ConnectTimeout and CloseTimeout.
+    // TODO: rework tests tests.
     cout << "testing timeout overrides... " << flush;
     {
         //
@@ -275,8 +278,6 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrx& controller
         //
         Ice::InitializationData initData;
         initData.properties = communicator->getProperties()->clone();
-        // initData.properties->setProperty("Ice.Override.ConnectTimeout", "250");
-        initData.properties->setProperty("Ice.ConnectTimeout", "1");     // 1 second
         initData.properties->setProperty("Ice.Override.Timeout", "100"); // 100 ms
         Ice::CommunicatorHolder ich(initData);
         TimeoutPrx to(ich.communicator(), sref);
@@ -318,8 +319,6 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrx& controller
         //
         Ice::InitializationData initData;
         initData.properties = communicator->getProperties()->clone();
-        // initData.properties->setProperty("Ice.Override.ConnectTimeout", "250");
-        initData.properties->setProperty("Ice.ConnectTimeout", "1");
         Ice::CommunicatorHolder ich(initData);
         controller->holdAdapter(-1);
         TimeoutPrx to(ich.communicator(), sref);
@@ -376,8 +375,6 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrx& controller
         //
         Ice::InitializationData initData;
         initData.properties = communicator->getProperties()->clone();
-        // initData.properties->setProperty("Ice.Override.CloseTimeout", "100");
-        initData.properties->setProperty("Ice.CloseTimeout", "1"); // 1 second
         Ice::CommunicatorHolder ich(initData);
         Ice::ConnectionPtr connection = ich->stringToProxy(sref)->ice_getConnection();
         controller->holdAdapter(-1);

diff --git a/cpp/test/Ice/timeout/Client.cpp b/cpp/test/Ice/timeout/Client.cpp
@@ -25,13 +25,8 @@ Client::run(int argc, char** argv)
     //
     properties->setProperty("Ice.RetryIntervals", "-1");
 
-#if TARGET_OS_IPHONE != 0
-    //
-    // COMPILERFIX: Disable connect timeout introduced for
-    // workaround to iOS device hangs when using SSL
-    //
-    // properties->setProperty("Ice.Override.ConnectTimeout", "");
-#endif
+    properties->setProperty("Ice.ConnectTimeout", "1");
+    properties->setProperty("Ice.CloseTimeout", "1");
 
     //
     // This test kills connections, so we don't want warnings.