diff options
Diffstat (limited to 'cs/config/IceGridAdmin.py')
| -rw-r--r-- | cs/config/IceGridAdmin.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cs/config/IceGridAdmin.py b/cs/config/IceGridAdmin.py index 7ff2c609ab1..cee5db55fc0 100644 --- a/cs/config/IceGridAdmin.py +++ b/cs/config/IceGridAdmin.py @@ -35,7 +35,7 @@ nodeOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Node.Trace.Adapter=0' + \ r' --IceGrid.Node.Trace.Server=0' + \ r' --IceGrid.Node.PrintServersReady=node' + \ - r' --Ice.NullHandleAbort' + \ + r' --Ice.NullHandleAbort' + \ r' --Ice.ThreadPool.Server.Size=0'; registryOptions = r' --Ice.Warn.Connections=0' + \ @@ -94,7 +94,7 @@ def startIceGridNode(testdir): cleanDbDir(dataDir) overrideOptions = '"' + TestUtil.clientServerOptions.replace("--", "") + \ - ' Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0"' + ' Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0"' print "starting icegrid node...", command = iceGrid + TestUtil.cppClientServerOptions + ' --nowarn ' + nodeOptions + \ @@ -121,14 +121,14 @@ def iceGridAdmin(cmd, ignoreFailure = False): user = r"admin1" if cmd == "registry shutdown": - user = r"shutdown" + user = r"shutdown" command = iceGridAdmin + TestUtil.cppClientOptions + \ r' --Ice.Default.Locator="IceGrid/Locator:default -p ' + iceGridPort + '" ' + \ r" --IceGridAdmin.Username=" + user + " --IceGridAdmin.Password=test1 " + \ r' -e "' + cmd + '"' if TestUtil.debug: - print "(" + command + ")", + print "(" + command + ")", iceGridAdminPipe = os.popen(command + " 2>&1") @@ -252,11 +252,11 @@ def cleanDbDir(path): fullpath = os.path.join(path, filename); if os.path.isdir(fullpath): cleanDbDir(fullpath) - try: - os.rmdir(fullpath) - except OSError: - # This might fail if the directory is empty (because it itself is - # a CVS directory). - pass + try: + os.rmdir(fullpath) + except OSError: + # This might fail if the directory is empty (because it itself is + # a CVS directory). + pass else: os.remove(fullpath) |