Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove remaining Ice.Override.ConnectTimeout #3063

Merged
merged 1 commit into from
Nov 5, 2024
Merged

Remove remaining Ice.Override.ConnectTimeout #3063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions cpp/test/Ice/timeout/Server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
//
Expand Down
1 change: 0 additions & 1 deletion java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
24 changes: 0 additions & 24 deletions java/test/src/main/java/test/Ice/binding/AllTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion js/test/Common/ControllerI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
15 changes: 0 additions & 15 deletions scripts/Util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down