diff options
author | Matthew Newhook <matthew@zeroc.com> | 2006-08-29 09:00:41 +0000 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2006-08-29 09:00:41 +0000 |
commit | 5517585e1d63ade7730a72c8df43d497c9491904 (patch) | |
tree | a5f297388f985400898a18fd269d75be6667e4c5 /cpp/config/IceGridAdmin.py | |
parent | Bug 1339. (diff) | |
download | ice-5517585e1d63ade7730a72c8df43d497c9491904.tar.bz2 ice-5517585e1d63ade7730a72c8df43d497c9491904.tar.xz ice-5517585e1d63ade7730a72c8df43d497c9491904.zip |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1274
Diffstat (limited to 'cpp/config/IceGridAdmin.py')
-rw-r--r-- | cpp/config/IceGridAdmin.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/config/IceGridAdmin.py b/cpp/config/IceGridAdmin.py index f445999de3a..117fab4bc94 100644 --- a/cpp/config/IceGridAdmin.py +++ b/cpp/config/IceGridAdmin.py @@ -121,13 +121,16 @@ def iceGridAdmin(cmd, ignoreFailure = False): global iceGridPort iceGridAdmin = os.path.join(toplevel, "bin", "icegridadmin") + user = r"admin1" + if cmd == "shutdown": + user = r"shutdown" command = iceGridAdmin + TestUtil.clientOptions + \ r' --Ice.Default.Locator="IceGrid/Locator:default -p ' + iceGridPort + '" ' + \ + r" --IceGridAdmin.Username=" + user + " --IceGridAdmin.Password=test1 " + \ r' -e "' + cmd + '" 2>&1' if debug: print command - iceGridAdminPipe = os.popen(command) output = iceGridAdminPipe.readlines() |