summaryrefslogtreecommitdiff
path: root/cpp/config/IcePackAdmin.py
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2003-12-23 17:36:28 +0000
committerMark Spruiell <mes@zeroc.com>2003-12-23 17:36:28 +0000
commit650ba99fbe730fec2993bb10b9aaf2cde6de1676 (patch)
tree7042550531d7f278f327bb3144e371bb8b06d1e8 /cpp/config/IcePackAdmin.py
parentFixed property warning for Starter.PermissionsVerifer (diff)
downloadice-650ba99fbe730fec2993bb10b9aaf2cde6de1676.tar.bz2
ice-650ba99fbe730fec2993bb10b9aaf2cde6de1676.tar.xz
ice-650ba99fbe730fec2993bb10b9aaf2cde6de1676.zip
adding IcePack tests
Diffstat (limited to 'cpp/config/IcePackAdmin.py')
-rw-r--r--cpp/config/IcePackAdmin.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/config/IcePackAdmin.py b/cpp/config/IcePackAdmin.py
index 6904f34403c..c783a12b9a5 100644
--- a/cpp/config/IcePackAdmin.py
+++ b/cpp/config/IcePackAdmin.py
@@ -134,6 +134,7 @@ def addApplication(descriptor, targets):
global icePackPort
icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
+ descriptor = descriptor.replace("\\", "/")
command = icePackAdmin + TestUtil.clientOptions + \
r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
r' -e "application add \"' + descriptor + '\\" ' + targets + ' \"'
@@ -149,6 +150,7 @@ def removeApplication(descriptor):
global icePackPort
icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
+ descriptor = descriptor.replace("\\", "/")
command = icePackAdmin + TestUtil.clientOptions + \
r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
r' -e "application remove \"' + descriptor + '\\" \"'
@@ -164,6 +166,9 @@ def addServer(name, serverDescriptor, server, libpath, targets):
global icePackPort
icePackAdmin = os.path.join(toplevel, "bin", "icepackadmin")
+ serverDescriptor = serverDescriptor.replace("\\", "/");
+ server = server.replace("\\", "/");
+ libpath = libpath.replace("\\", "/");
command = icePackAdmin + TestUtil.clientOptions + \
r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \
r' -e "server add localnode \"' + name + '\\" \\"' + serverDescriptor + '\\" ' + \
@@ -172,6 +177,7 @@ def addServer(name, serverDescriptor, server, libpath, targets):
icePackAdminPipe = os.popen(command)
icePackAdminStatus = icePackAdminPipe.close()
if icePackAdminStatus:
+ print "bailing out"
TestUtil.killServers()
sys.exit(1)