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/IceGridUtil.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/IceGridUtil.py')
| -rw-r--r-- | scripts/IceGridUtil.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py index 2e9ec2b8129..c981b63eaae 100644 --- a/scripts/IceGridUtil.py +++ b/scripts/IceGridUtil.py @@ -136,8 +136,6 @@ class IceGridRegistry(ProcessFromBinDir, Server): pass def getProps(self, current): - # 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 = { 'IceGrid.InstanceName' : 'TestIceGrid', 'IceGrid.Registry.PermissionsVerifier' : 'TestIceGrid/NullPermissionsVerifier', @@ -148,6 +146,7 @@ class IceGridRegistry(ProcessFromBinDir, Server): 'IceGrid.Registry.Internal.Endpoints' : 'default', 'IceGrid.Registry.Client.Endpoints' : self.getEndpoints(current), 'IceGrid.Registry.Discovery.Port' : current.driver.getTestPort(99), + "IceGrid.Registry.Discovery.Interface": "::1" if current.config.ipv6 else "127.0.0.1", 'IceGrid.Registry.SessionManager.Endpoints' : 'default', 'IceGrid.Registry.AdminSessionManager.Endpoints' : 'default', 'IceGrid.Registry.SessionTimeout' : 60, |