diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-01-12 15:19:23 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-01-12 15:19:23 +0000 |
| commit | ef8217312bfea87d475fe2ea8d573cf6734d0773 (patch) | |
| tree | 7dd2f2b9b9571ccce57fe8b9121a13eb65db31cf | |
| parent | Use registry shutdown (diff) | |
| download | ice-ef8217312bfea87d475fe2ea8d573cf6734d0773.tar.bz2 ice-ef8217312bfea87d475fe2ea8d573cf6734d0773.tar.xz ice-ef8217312bfea87d475fe2ea8d573cf6734d0773.zip | |
Fix
| -rw-r--r-- | cs/config/IceGridAdmin.py | 6 | ||||
| -rw-r--r-- | java/config/IceGridAdmin.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cs/config/IceGridAdmin.py b/cs/config/IceGridAdmin.py index 6d8d2ae2c32..7ff2c609ab1 100644 --- a/cs/config/IceGridAdmin.py +++ b/cs/config/IceGridAdmin.py @@ -120,7 +120,7 @@ def iceGridAdmin(cmd, ignoreFailure = False): iceGridAdmin = os.path.join(ice_home, "bin", "icegridadmin") user = r"admin1" - if cmd == "shutdown": + if cmd == "registry shutdown": user = r"shutdown" command = iceGridAdmin + TestUtil.cppClientOptions + \ r' --Ice.Default.Locator="IceGrid/Locator:default -p ' + iceGridPort + '" ' + \ @@ -194,7 +194,7 @@ def iceGridTest(name, application, additionalOptions = "", applicationOptions = print "ok" iceGridAdmin("node shutdown localnode") - iceGridAdmin("shutdown") + iceGridAdmin("registry shutdown") TestUtil.joinServers() @@ -237,7 +237,7 @@ def iceGridClientServerTest(name, additionalClientOptions, additionalServerOptio TestUtil.killServers() sys.exit(1) - iceGridAdmin("shutdown") + iceGridAdmin("registry shutdown") TestUtil.joinServers() diff --git a/java/config/IceGridAdmin.py b/java/config/IceGridAdmin.py index 412d09f9a9b..8b7bf187d40 100644 --- a/java/config/IceGridAdmin.py +++ b/java/config/IceGridAdmin.py @@ -124,7 +124,7 @@ def iceGridAdmin(cmd, ignoreFailure = False): iceGridAdmin = os.path.join(ice_home, "bin", "icegridadmin") user = r"admin1" - if cmd == "shutdown": + if cmd == "registry shutdown": user = r"shutdown" command = iceGridAdmin + TestUtil.cppClientOptions + \ r' --Ice.Default.Locator="IceGrid/Locator:default -p ' + iceGridPort + '" ' + \ @@ -198,7 +198,7 @@ def iceGridTest(name, application, additionalOptions = "", applicationOptions = print "ok" iceGridAdmin("node shutdown localnode") - iceGridAdmin("shutdown") + iceGridAdmin("registry shutdown") TestUtil.joinServers() @@ -241,7 +241,7 @@ def iceGridClientServerTest(name, additionalClientOptions, additionalServerOptio TestUtil.killServers() sys.exit(1) - iceGridAdmin("shutdown") + iceGridAdmin("registry shutdown") TestUtil.joinServers() |