diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-01-26 08:32:15 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-26 08:32:15 +0100 |
| commit | 655ce0efca250a8103e51883f1b7dd34a9a0df4f (patch) | |
| tree | 8dedf5435f225517b9c49ce52de0835fed803aee /scripts/Util.py | |
| parent | First cut of ICE-6920 - Remove try/catch block around communicator destroy (diff) | |
| download | ice-655ce0efca250a8103e51883f1b7dd34a9a0df4f.tar.bz2 ice-655ce0efca250a8103e51883f1b7dd34a9a0df4f.tar.xz ice-655ce0efca250a8103e51883f1b7dd34a9a0df4f.zip | |
Fixed ICE-7496 - Ice/binding too slow, speed up of tests on Windows
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 4440b814af6..14b76f00024 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -218,11 +218,6 @@ class Windows(Platform): if config.uwp: return (["Ice/.*", "IceSSL/configuration"], ["Ice/background", - # - # TODO: Test scripts are killing the Ice/binding test because it takes - # too much time to run - # - "Ice/binding", "Ice/checksum", "Ice/custom", "Ice/defaultServant", @@ -605,6 +600,21 @@ class Mapping: 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"] = "100" + # Additional properties specified on the command line with --cprops or --sprops additionalProps = [] if self.cprops and isinstance(process, Client): |