diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-10 18:54:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-10 18:54:03 +0200 |
| commit | f0fbb296946f95b2bd94e86d72df618aadf3268c (patch) | |
| tree | db0a9894acd0ff3b0c4efd7ec7dc9bc2d00d56e0 /scripts/tests/IceDiscovery/simple.py | |
| parent | Fix slice/errorDetection test (diff) | |
| download | ice-f0fbb296946f95b2bd94e86d72df618aadf3268c.tar.bz2 ice-f0fbb296946f95b2bd94e86d72df618aadf3268c.tar.xz ice-f0fbb296946f95b2bd94e86d72df618aadf3268c.zip | |
Fixed ICE-7849 - Removed IceDiscovery/IceLocatorDiscovery ice_getConnection call, added IceGrid/simple C++11 test
Diffstat (limited to 'scripts/tests/IceDiscovery/simple.py')
| -rw-r--r-- | scripts/tests/IceDiscovery/simple.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/tests/IceDiscovery/simple.py b/scripts/tests/IceDiscovery/simple.py index ef6f8163553..4eab32122e4 100644 --- a/scripts/tests/IceDiscovery/simple.py +++ b/scripts/tests/IceDiscovery/simple.py @@ -11,12 +11,16 @@ props = lambda process, current: { "IceDiscovery.Timeout": 50, "IceDiscovery.RetryCount": 5, - "IceDiscovery.Interface": "" if isinstance(platform, Linux) else "::1" if current.config.ipv6 else "127.0.0.1", + "IceDiscovery.Interface": "::1" if current.config.ipv6 else "127.0.0.1", "IceDiscovery.Port": current.driver.getTestPort(10), "Ice.Plugin.IceDiscovery": current.getPluginEntryPoint("IceDiscovery", process) } +# Filter-out the warning about invalid lookup proxy +outfilters = [ lambda x: re.sub("-! .* warning: .*failed to lookup adapter.*\n", "", x), + lambda x: re.sub("^ .*\n", "", x) ] + TestSuite(__name__, [ - ClientServerTestCase(client=Client(args=[3], props=props), + ClientServerTestCase(client=Client(args=[3], props=props, outfilters=outfilters), servers=[Server(args=[i], readyCount=4, props=props) for i in range(0, 3)]) ], multihost=False) |