diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-10 22:00:52 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-10 22:00:52 +0200 |
| commit | 8d04ccdca27f1198713f173729a13980f60ff795 (patch) | |
| tree | 62cd717edd136eee6570fd8456f47e80ae2cb718 /scripts/tests | |
| parent | Fixed ICE-7869 - IceGridGUI NPE (diff) | |
| download | ice-8d04ccdca27f1198713f173729a13980f60ff795.tar.bz2 ice-8d04ccdca27f1198713f173729a13980f60ff795.tar.xz ice-8d04ccdca27f1198713f173729a13980f60ff795.zip | |
Fix for IceDiscovery/IceLocatorDiscovery Linux failures
Diffstat (limited to 'scripts/tests')
| -rw-r--r-- | scripts/tests/IceDiscovery/simple.py | 2 | ||||
| -rw-r--r-- | scripts/tests/IceGrid/simple.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/tests/IceDiscovery/simple.py b/scripts/tests/IceDiscovery/simple.py index 4eab32122e4..e948e8d248b 100644 --- a/scripts/tests/IceDiscovery/simple.py +++ b/scripts/tests/IceDiscovery/simple.py @@ -11,7 +11,7 @@ props = lambda process, current: { "IceDiscovery.Timeout": 50, "IceDiscovery.RetryCount": 5, - "IceDiscovery.Interface": "::1" if current.config.ipv6 else "127.0.0.1", + "IceDiscovery.Interface": "" if isinstance(platform, Linux) else "::1" if current.config.ipv6 else "127.0.0.1", "IceDiscovery.Port": current.driver.getTestPort(10), "Ice.Plugin.IceDiscovery": current.getPluginEntryPoint("IceDiscovery", process) } diff --git a/scripts/tests/IceGrid/simple.py b/scripts/tests/IceGrid/simple.py index dc87a4a7f62..002ac0cf89b 100644 --- a/scripts/tests/IceGrid/simple.py +++ b/scripts/tests/IceGrid/simple.py @@ -20,7 +20,7 @@ registryProps = { clientProps = lambda process, current: { "IceLocatorDiscovery.Timeout": 50, "IceLocatorDiscovery.RetryCount": 5, - "IceLocatorDiscovery.Interface": "::1" if current.config.ipv6 else "127.0.0.1", + "IceLocatorDiscovery.Interface": "" if isinstance(platform, Linux) else "::1" if current.config.ipv6 else "127.0.0.1", "IceLocatorDiscovery.Port": current.driver.getTestPort(99), } |