diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-11-28 14:32:20 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-11-28 14:32:20 +0100 |
| commit | 50013d212e3c3fd0aa5acaaa1ed1c504ca0ef290 (patch) | |
| tree | f9700ab294dae16c4628a6ad3e29ba8d7f83c14b /scripts/tests/IceDiscovery/simple.py | |
| parent | Remove CSharp mono pkgconfig files (diff) | |
| download | ice-50013d212e3c3fd0aa5acaaa1ed1c504ca0ef290.tar.bz2 ice-50013d212e3c3fd0aa5acaaa1ed1c504ca0ef290.tar.xz ice-50013d212e3c3fd0aa5acaaa1ed1c504ca0ef290.zip | |
Fixed staticFiltering test failure, network proxy test hang, added support for builddir variable
Diffstat (limited to 'scripts/tests/IceDiscovery/simple.py')
| -rw-r--r-- | scripts/tests/IceDiscovery/simple.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/tests/IceDiscovery/simple.py b/scripts/tests/IceDiscovery/simple.py index 36b4f86a39e..292cc8c7b67 100644 --- a/scripts/tests/IceDiscovery/simple.py +++ b/scripts/tests/IceDiscovery/simple.py @@ -13,12 +13,12 @@ props = lambda process, current: { "IceDiscovery.Timeout": 50, "IceDiscovery.RetryCount": 5, "IceDiscovery.Interface": "127.0.0.1" if not current.config.ipv6 else "\"::1\"" if isinstance(platform, Darwin) else "", - "Ice.Plugin.IceDiscovery": current.getPluginEntryPoint("IceDiscovery") + "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") + "Ice.Plugin.IceDiscovery": current.getPluginEntryPoint("IceDiscovery", process) }.items(), props(process, current).items())) TestSuite(__name__, [ |