diff options
Diffstat (limited to 'scripts/tests/IceDiscovery/simple.py')
| -rw-r--r-- | scripts/tests/IceDiscovery/simple.py | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/scripts/tests/IceDiscovery/simple.py b/scripts/tests/IceDiscovery/simple.py index 4f395201894..82c9d177e93 100644 --- a/scripts/tests/IceDiscovery/simple.py +++ b/scripts/tests/IceDiscovery/simple.py @@ -8,26 +8,15 @@ # # ********************************************************************** -# -# Client properties (plugin is loaded with Ice::registerPluginFactory) -# -# NOTE: we use the loopback interface for multicast with IPv6 to prevent failures -# on some machines which don't really have an IPv6 interface configured. -# props = lambda process, current: { "IceDiscovery.Timeout": 50, "IceDiscovery.RetryCount": 5, + "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) } -# Server properties (client properties + plugin configuration) -serverProps = lambda process, current: dict(itertools.chain({ - "Ice.Plugin.IceDiscovery": current.getPluginEntryPoint("IceDiscovery", process), - "IceDiscovery.Port": current.driver.getTestPort(10) -}.items(), props(process, current).items())) - TestSuite(__name__, [ ClientServerTestCase(client=Client(args=[3], props=props), - servers=[Server(args=[i], readyCount=4, props=serverProps) for i in range(0, 3)]) + servers=[Server(args=[i], readyCount=4, props=props) for i in range(0, 3)]) ], multihost=False) |