From 77aa26258d503969d591b35fcb82753bdf0a4dcd Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Mon, 4 Nov 2024 18:31:32 -0500 Subject: [PATCH] Remove remaing Ice.Override.ConnectTimeout --- cpp/test/Ice/timeout/Server.cpp | 8 ------- .../zeroc/testcontroller/ControllerApp.java | 1 - .../main/java/test/Ice/binding/AllTests.java | 24 ------------------- js/test/Common/ControllerI.js | 1 - scripts/Util.py | 15 ------------ 5 files changed, 49 deletions(-) diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp index 2bb52d50132..fe210bba642 100644 --- a/cpp/test/Ice/timeout/Server.cpp +++ b/cpp/test/Ice/timeout/Server.cpp @@ -19,14 +19,6 @@ Server::run(int argc, char** argv) { Ice::PropertiesPtr properties = createTestProperties(argc, argv); -#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 - // // This test kills connections, so we don't want warnings. // diff --git a/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java b/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java index 933002e8886..c0f1058ea52 100644 --- a/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java +++ b/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java @@ -197,7 +197,6 @@ public ControllerI(boolean bluetooth) initData.properties.setProperty("Ice.ThreadPool.Server.SizeMax", "10"); initData.properties.setProperty("ControllerAdapter.Endpoints", "tcp"); initData.properties.setProperty("ControllerAdapter.AdapterId", java.util.UUID.randomUUID().toString()); - initData.properties.setProperty("Ice.Override.ConnectTimeout", "1000"); if(!isEmulator()) { if(bluetooth) diff --git a/java/test/src/main/java/test/Ice/binding/AllTests.java b/java/test/src/main/java/test/Ice/binding/AllTests.java index e941291c618..5273e7f69f8 100644 --- a/java/test/src/main/java/test/Ice/binding/AllTests.java +++ b/java/test/src/main/java/test/Ice/binding/AllTests.java @@ -75,10 +75,6 @@ public static void allTests(test.TestHelper helper) { // Usually the actual type of this exception is ConnectionRefusedException, // but not always. See bug 3179. // - } catch (com.zeroc.Ice.ConnectTimeoutException ex) { - // - // On Windows, we set Ice.Override.ConnectTimeout to speed up testing. - // } } out.println("ok"); @@ -409,10 +405,6 @@ public static void allTests(test.TestHelper helper) { // Usually the actual type of this exception is ConnectionRefusedException, // but not always. See bug 3179. // - } catch (com.zeroc.Ice.ConnectTimeoutException ex) { - // - // On Windows, we set Ice.Override.ConnectTimeout to speed up testing. - // } Endpoint[] endpoints = test.ice_getEndpoints(); @@ -467,10 +459,6 @@ public static void allTests(test.TestHelper helper) { // Usually the actual type of this exception is ConnectionRefusedException, // but not always. See bug 3179. // - } catch (com.zeroc.Ice.ConnectTimeoutException ex) { - // - // On Windows, we set Ice.Override.ConnectTimeout to speed up testing. - // } } out.println("ok"); @@ -585,10 +573,6 @@ public static void allTests(test.TestHelper helper) { // Usually the actual type of this exception is ConnectionRefusedException, // but not always. See bug 3179. // - } catch (com.zeroc.Ice.ConnectTimeoutException ex) { - // - // On Windows, we set Ice.Override.ConnectTimeout to speed up testing. - // } Endpoint[] endpoints = test.ice_getEndpoints(); @@ -656,10 +640,6 @@ public static void allTests(test.TestHelper helper) { // Usually the actual type of this exception is ConnectionRefusedException, // but not always. See bug 3179. // - } catch (com.zeroc.Ice.ConnectTimeoutException ex) { - // - // On Windows, we set Ice.Override.ConnectTimeout to speed up testing. - // } Endpoint[] endpoints = test.ice_getEndpoints(); @@ -753,10 +733,6 @@ public static void allTests(test.TestHelper helper) { // Usually the actual type of this exception is ConnectionRefusedException, // but not always. See bug 3179. // - } catch (com.zeroc.Ice.ConnectTimeoutException ex) { - // - // On Windows, we set Ice.Override.ConnectTimeout to speed up testing. - // } deactivate(rcom, adapters); diff --git a/js/test/Common/ControllerI.js b/js/test/Common/ControllerI.js index a8c349b0b24..7c0ecd35cd4 100644 --- a/js/test/Common/ControllerI.js +++ b/js/test/Common/ControllerI.js @@ -154,7 +154,6 @@ export async function runController(clientOutput, serverOutput, scripts) { const initData = new Ice.InitializationData(); initData.logger = new Logger(out); initData.properties = Ice.createProperties(); - initData.properties.setProperty("Ice.Override.ConnectTimeout", "1000"); async function registerProcessController(adapter, registry, processController) { try { diff --git a/scripts/Util.py b/scripts/Util.py index 5306555c4c7..cc9e1764ca7 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -883,21 +883,6 @@ def getProps(self, process, current): props["IceMX.Metrics.Parent.GroupBy"] = "parent" props["IceMX.Metrics.All.GroupBy"] = "none" - # - # Speed up Windows testing. We override the connect timeout for some tests which are - # establishing connections to inactive ports. It takes around 1s for such connection - # establishment to fail on Windows. - # - # if isinstance(platform, Windows): - # if current.testsuite.getId().startswith("IceGrid") or \ - # current.testsuite.getId() in ["Ice/binding", - # "Ice/location", - # "Ice/background", - # "Ice/faultTolerance", - # "Ice/services", - # "IceDiscovery/simple"]: - # props["Ice.Override.ConnectTimeout"] = "400" - # Additional properties specified on the command line with --cprops or --sprops additionalProps = [] if self.cprops and isinstance(process, Client):