diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-08-14 07:19:13 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-08-14 07:19:13 +0200 |
| commit | b0f0bc95d4db337fa4250dd8c320d921908f55a2 (patch) | |
| tree | 477644c3b5b3822f4d12a5a269406d2928aebf2e /csharp/test | |
| parent | Another minor fix for Expect.py script (diff) | |
| download | ice-b0f0bc95d4db337fa4250dd8c320d921908f55a2.tar.bz2 ice-b0f0bc95d4db337fa4250dd8c320d921908f55a2.tar.xz ice-b0f0bc95d4db337fa4250dd8c320d921908f55a2.zip | |
Revert "Fixed ICE-6707 - default interface for discovery is now Ice.Default.Host if it is set"
This reverts commit 406e393f2be3a29830a7758e58e4e674afc5e21e.
Diffstat (limited to 'csharp/test')
| -rwxr-xr-x | csharp/test/IceDiscovery/simple/run.py | 3 | ||||
| -rw-r--r-- | csharp/test/IceGrid/simple/AllTests.cs | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/csharp/test/IceDiscovery/simple/run.py b/csharp/test/IceDiscovery/simple/run.py index fdb42d64382..a8e7fe8242e 100755 --- a/csharp/test/IceDiscovery/simple/run.py +++ b/csharp/test/IceDiscovery/simple/run.py @@ -33,6 +33,9 @@ if TestUtil.isDarwin() and TestUtil.ipv6: print("test not supported on OS X with IPv6") sys.exit(0) +if not TestUtil.ipv6: + args += " --IceDiscovery.Interface=127.0.0.1" + serverProc = [] for i in range(0, num): sys.stdout.write("starting server #%d... " % (i + 1)) diff --git a/csharp/test/IceGrid/simple/AllTests.cs b/csharp/test/IceGrid/simple/AllTests.cs index 40d826e5cab..96af8c4bdb3 100644 --- a/csharp/test/IceGrid/simple/AllTests.cs +++ b/csharp/test/IceGrid/simple/AllTests.cs @@ -63,7 +63,7 @@ public class AllTests IceGrid.RegistryPrx registry = IceGrid.RegistryPrxHelper.checkedCast( communicator.stringToProxy(communicator.getDefaultLocator().ice_getIdentity().category + "/Registry")); test(registry != null); - + try { IceGrid.AdminSessionPrx session = registry.createAdminSession("foo", "bar"); @@ -82,11 +82,16 @@ public class AllTests Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = communicator.getProperties().ice_clone_(); initData.properties.setProperty("Ice.Default.Locator", ""); - initData.properties.setProperty("Ice.Plugin.IceLocatorDiscovery", + initData.properties.setProperty("Ice.Plugin.IceLocatorDiscovery", "IceLocatorDiscovery:IceLocatorDiscovery.PluginFactory"); + if(IceInternal.AssemblyUtil.osx_ && + initData.properties.getPropertyAsInt("Ice.PreferIPv6Address") > 0) + { + initData.properties.setProperty("IceLocatorDiscovery.Interface", "::1"); + } initData.properties.setProperty("AdapterForDiscoveryTest.AdapterId", "discoveryAdapter"); initData.properties.setProperty("AdapterForDiscoveryTest.Endpoints", "default"); - + Ice.Communicator com = Ice.Util.initialize(initData); test(com.getDefaultLocator() != null); com.stringToProxy("test @ TestAdapter").ice_ping(); @@ -104,7 +109,7 @@ public class AllTests // // Now, ensure that the IceGrid discovery locator correctly // handles failure to find a locator. - // + // initData.properties.setProperty("IceLocatorDiscovery.InstanceName", "unknown"); initData.properties.setProperty("IceLocatorDiscovery.RetryCount", "1"); initData.properties.setProperty("IceLocatorDiscovery.Timeout", "100"); |