diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-02-10 08:43:01 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-02-10 08:43:01 +0100 |
| commit | ac561fd27e11ac826a380a465945cd345eb8d2a4 (patch) | |
| tree | e22e5b609abbef760cb4c23dddd58f994531e602 /scripts/Util.py | |
| parent | Fixed ICE-7574 - Bumped timeout (diff) | |
| download | ice-ac561fd27e11ac826a380a465945cd345eb8d2a4.tar.bz2 ice-ac561fd27e11ac826a380a465945cd345eb8d2a4.tar.xz ice-ac561fd27e11ac826a380a465945cd345eb8d2a4.zip | |
Disabled connect timeout to speed up testing on Windows (ICE-7573)
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index a26b4f3f144..5d48e6259a1 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -605,15 +605,15 @@ class Mapping: # 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" + # 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 = [] |