diff options
| author | Michi Henning <michi@zeroc.com> | 2004-07-06 04:10:07 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2004-07-06 04:10:07 +0000 |
| commit | 65d19258f37bec2de10cb85ce850868eea18251b (patch) | |
| tree | 846c4d9b304888005055412fde76cbca9beb10c3 /cpp/config/IcePackAdmin.py | |
| parent | Changed test scripts to use unbuffered I/O so when we run the scripts from (diff) | |
| download | ice-65d19258f37bec2de10cb85ce850868eea18251b.tar.bz2 ice-65d19258f37bec2de10cb85ce850868eea18251b.tar.xz ice-65d19258f37bec2de10cb85ce850868eea18251b.zip | |
Got carried away when changing the tests to unbuffered I/O and changed more
than necessary. Changed back now :-)
Diffstat (limited to 'cpp/config/IcePackAdmin.py')
| -rw-r--r-- | cpp/config/IcePackAdmin.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/config/IcePackAdmin.py b/cpp/config/IcePackAdmin.py index 592136a9bcd..b78eb5735a6 100644 --- a/cpp/config/IcePackAdmin.py +++ b/cpp/config/IcePackAdmin.py @@ -68,7 +68,7 @@ def startIcePackRegistry(port, testdir): r' --IcePack.Registry.Trace.NodeRegistry=0' + \ r' --Ice.ProgramName=icepackregistry' - (stdin, icePackPipe) = os.popen4(command, "r", 0) + (stdin, icePackPipe) = os.popen4(command) TestUtil.getServerPid(icePackPipe) TestUtil.getAdapterReady(icePackPipe) TestUtil.getAdapterReady(icePackPipe) @@ -104,7 +104,7 @@ def startIcePackNode(testdir): r' --IcePack.Node.Trace.Server=0' + \ r' --IcePack.Node.PrintServersReady=node' - (stdin, icePackPipe) = os.popen4(command, "r", 0) + (stdin, icePackPipe) = os.popen4(command) TestUtil.getServerPid(icePackPipe) TestUtil.getAdapterReady(icePackPipe) TestUtil.waitServiceReady(icePackPipe, 'node') @@ -125,7 +125,7 @@ def shutdownIcePackRegistry(): r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \ r' -e "shutdown" ' + " 2>&1" - icePackAdminPipe = os.popen(command, "r", 0) + icePackAdminPipe = os.popen(command) TestUtil.printOutputFromPipe(icePackAdminPipe) icePackAdminStatus = icePackAdminPipe.close() if icePackAdminStatus: @@ -143,7 +143,7 @@ def shutdownIcePackNode(): r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \ r' -e "node shutdown localnode" ' + " 2>&1" - icePackAdminPipe = os.popen(command, "r", 0) + icePackAdminPipe = os.popen(command) TestUtil.printOutputFromPipe(icePackAdminPipe) icePackAdminStatus = icePackAdminPipe.close() if icePackAdminStatus: @@ -161,7 +161,7 @@ def addApplication(descriptor, options): r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \ r' -e "application add \"' + descriptor + '\\" ' + options + ' \"' + " 2>&1" - icePackAdminPipe = os.popen(command, "r", 0) + icePackAdminPipe = os.popen(command) TestUtil.printOutputFromPipe(icePackAdminPipe) icePackAdminStatus = icePackAdminPipe.close() if icePackAdminStatus: @@ -177,7 +177,7 @@ def removeApplication(name): r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \ r' -e "application remove \"' + name + '\\" \"' + " 2>&1" - icePackAdminPipe = os.popen(command, "r", 0) + icePackAdminPipe = os.popen(command) TestUtil.printOutputFromPipe(icePackAdminPipe) icePackAdminStatus = icePackAdminPipe.close() if icePackAdminStatus: @@ -195,7 +195,7 @@ def addServer(serverDescriptor, options): r' -e "server add ' + serverDescriptor + ' localnode ' + \ r' ' + options + '\"' + " 2>&1" - icePackAdminPipe = os.popen(command, "r", 0) + icePackAdminPipe = os.popen(command) TestUtil.printOutputFromPipe(icePackAdminPipe) icePackAdminStatus = icePackAdminPipe.close() if icePackAdminStatus: @@ -212,7 +212,7 @@ def removeServer(name): r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \ r' -e "server remove \"' + name + '\\" \"' + " 2>&1" - icePackAdminPipe = os.popen(command, "r", 0) + icePackAdminPipe = os.popen(command) icePackAdminStatus = icePackAdminPipe.close() if icePackAdminStatus: TestUtil.killServers() @@ -227,7 +227,7 @@ def startServer(name): r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \ r' -e "server start \"' + name + '\\""' + " 2>&1" - icePackAdminPipe = os.popen(command, "r", 0) + icePackAdminPipe = os.popen(command) icePackAdminStatus = icePackAdminPipe.close() if icePackAdminStatus: TestUtil.killServers() @@ -242,7 +242,7 @@ def listAdapters(): r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \ r' -e "adapter list"' + " 2>&1" - icePackAdminPipe = os.popen(command, "r", 0) + icePackAdminPipe = os.popen(command) return icePackAdminPipe def cleanDbDir(path): |