Fixed ICE-7849 - Removed IceDiscovery/IceLocatorDiscovery ice_getConnection call, added IceGrid/simple C++11 test

2 files changed, 19 insertions, 3 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)
diff --git a/scripts/tests/IceGrid/simple.py b/scripts/tests/IceGrid/simple.py
index 30110ee5197..dc87a4a7f62 100644
--- a/scripts/tests/IceGrid/simple.py
+++ b/scripts/tests/IceGrid/simple.py
@@ -17,11 +17,23 @@ registryProps = {
     "IceGrid.Registry.DynamicRegistration" : 1
 }
 
+clientProps = lambda process, current: {
+    "IceLocatorDiscovery.Timeout": 50,
+    "IceLocatorDiscovery.RetryCount": 5,
+    "IceLocatorDiscovery.Interface": "::1" if current.config.ipv6 else "127.0.0.1",
+    "IceLocatorDiscovery.Port": current.driver.getTestPort(99),
+}
+
+# Filter-out the warning about invalid lookup proxy
+outfilters = [ lambda x: re.sub("-! .* warning: .*failed to lookup locator.*\n", "", x),
+               lambda x: re.sub("^   .*\n", "", x) ]
+
 TestSuite(__name__, [
     IceGridTestCase("without deployment", application=None,
                     icegridregistry=[IceGridRegistryMaster(props=registryProps),
                                      IceGridRegistrySlave(1, props=registryProps),
                                      IceGridRegistrySlave(2, props=registryProps)],
-                    client=ClientServerTestCase(client=IceGridClient(), server=IceGridServer(props=serverProps))),
+                    client=ClientServerTestCase(client=IceGridClient(props=clientProps, outfilters=outfilters),
+                                                server=IceGridServer(props=serverProps))),
     IceGridTestCase("with deployment", client=IceGridClient(args=["--with-deploy"]))
 ], multihost=False)