diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-07-10 14:16:59 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-07-10 14:16:59 +0200 |
| commit | 9962c1c90ddb9a0986bb98f84f2d97685203fce0 (patch) | |
| tree | fef7973a98850f43f7118f65b8e8b8586286d987 /cpp/test/IceGrid/admin/run.py | |
| parent | Fix background test. (diff) | |
| download | ice-9962c1c90ddb9a0986bb98f84f2d97685203fce0.tar.bz2 ice-9962c1c90ddb9a0986bb98f84f2d97685203fce0.tar.xz ice-9962c1c90ddb9a0986bb98f84f2d97685203fce0.zip | |
ICE-4612: first cut of the IceGrid discovery plugin and APIs
Diffstat (limited to 'cpp/test/IceGrid/admin/run.py')
| -rwxr-xr-x | cpp/test/IceGrid/admin/run.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/test/IceGrid/admin/run.py b/cpp/test/IceGrid/admin/run.py index 868b9aaa058..33ce1c5c529 100755 --- a/cpp/test/IceGrid/admin/run.py +++ b/cpp/test/IceGrid/admin/run.py @@ -43,11 +43,11 @@ sys.stdout.flush() args = ' --Glacier2.SessionTimeout=5' + \ ' --Glacier2.Client.Endpoints="default -p 12347"' + \ ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \ - ' --Glacier2.SessionManager=IceGrid/AdminSessionManager' + \ + ' --Glacier2.SessionManager=TestIceGrid/AdminSessionManager' + \ ' --Glacier2.PermissionsVerifier=Glacier2/NullPermissionsVerifier' + \ - ' --Glacier2.SSLSessionManager=IceGrid/AdminSSLSessionManager' + \ + ' --Glacier2.SSLSessionManager=TestIceGrid/AdminSSLSessionManager' + \ ' --Glacier2.SSLPermissionsVerifier=Glacier2/NullSSLPermissionsVerifier' + \ - ' --Ice.Default.Locator="IceGrid/Locator:default -p 12010"' + \ + ' --Ice.Default.Locator="TestIceGrid/Locator:default -p 12010"' + \ ' --IceSSL.VerifyPeer=1' routerProc = TestUtil.startServer(router, args, count=2) print("ok") @@ -57,7 +57,7 @@ sys.stdout.flush() # Direct registry connection with username/password icegridadmin = TestUtil.getIceGridAdmin() -args = ' --Ice.Default.Locator="IceGrid/Locator:default -p 12010"' + \ +args = ' --Ice.Default.Locator="TestIceGrid/Locator:default -p 12010"' + \ ' --IceGridAdmin.Username=demo' + \ ' --IceGridAdmin.Password=dummy' admin = TestUtil.startClient(icegridadmin, args, None, None, False) @@ -86,7 +86,7 @@ if TestUtil.protocol == "ssl": # Direct registry connection with SSL icegridadmin = TestUtil.getIceGridAdmin() - args = ' --Ice.Default.Locator="IceGrid/Locator:default -p 12010" --ssl' + args = ' --Ice.Default.Locator="TestIceGrid/Locator:default -p 12010" --ssl' admin = TestUtil.startClient(icegridadmin, args, None, None, False) admin.expect('>>> ') admin.sendline("server list") @@ -108,7 +108,7 @@ if TestUtil.protocol == "ssl": sys.stdout.write("testing commands... ") sys.stdout.flush() icegridadmin = TestUtil.getIceGridAdmin() -args = ' --Ice.Default.Locator="IceGrid/Locator:default -p 12010"' + \ +args = ' --Ice.Default.Locator="TestIceGrid/Locator:default -p 12010"' + \ ' --IceGridAdmin.Username=demo' + \ ' --IceGridAdmin.Password=dummy' admin = TestUtil.startClient(icegridadmin, args, None, None, False) |