diff options
36 files changed, 96 insertions, 96 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): diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py index b50151e1cac..f6f2599b9e9 100644 --- a/cpp/config/TestUtil.py +++ b/cpp/config/TestUtil.py @@ -251,13 +251,13 @@ def clientServerTestWithOptionsAndNames(name, additionalServerOptions, additiona client = os.path.join(testdir, clientName) print "starting " + serverName + "...", - serverPipe = os.popen(server + serverOptions + additionalServerOptions + " 2>&1", "r", 0) + serverPipe = os.popen(server + serverOptions + additionalServerOptions + " 2>&1") getServerPid(serverPipe) getAdapterReady(serverPipe) print "ok" print "starting " + clientName + "...", - clientPipe = os.popen(client + clientOptions + additionalClientOptions + " 2>&1", "r", 0) + clientPipe = os.popen(client + clientOptions + additionalClientOptions + " 2>&1") print "ok" printOutputFromPipe(clientPipe) @@ -284,13 +284,13 @@ def mixedClientServerTestWithOptions(name, additionalServerOptions, additionalCl client = os.path.join(testdir, "client") print "starting server...", - serverPipe = os.popen(server + clientServerOptions + additionalServerOptions + " 2>&1", "r", 0) + serverPipe = os.popen(server + clientServerOptions + additionalServerOptions + " 2>&1") getServerPid(serverPipe) getAdapterReady(serverPipe) print "ok" print "starting client...", - clientPipe = os.popen(client + clientServerOptions + additionalClientOptions + " 2>&1", "r", 0) + clientPipe = os.popen(client + clientServerOptions + additionalClientOptions + " 2>&1") getServerPid(clientPipe) getAdapterReady(clientPipe) print "ok" @@ -314,7 +314,7 @@ def collocatedTestWithOptions(name, additionalOptions): collocated = os.path.join(testdir, "collocated") print "starting collocated...", - collocatedPipe = os.popen(collocated + collocatedOptions + additionalOptions + " 2>&1", "r", 0) + collocatedPipe = os.popen(collocated + collocatedOptions + additionalOptions + " 2>&1") print "ok" printOutputFromPipe(collocatedPipe) diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py index 29d8431041a..0c37e77359a 100755 --- a/cpp/test/Freeze/complex/run.py +++ b/cpp/test/Freeze/complex/run.py @@ -32,7 +32,7 @@ TestUtil.cleanDbDir(dbdir) client = os.path.join(testdir, "client") print "starting populate...", -populatePipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " populate" + " 2>&1", "r", 0) +populatePipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " populate" + " 2>&1") print "ok" TestUtil.printOutputFromPipe(populatePipe) @@ -43,7 +43,7 @@ if populateStatus: sys.exit(1) print "starting verification client...", -clientPipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " validate" + " 2>&1", "r", 0) +clientPipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " validate" + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/cpp/test/Freeze/dbmap/run.py b/cpp/test/Freeze/dbmap/run.py index d9b2bedff27..9cc9cd8ed39 100755 --- a/cpp/test/Freeze/dbmap/run.py +++ b/cpp/test/Freeze/dbmap/run.py @@ -29,7 +29,7 @@ TestUtil.cleanDbDir(dbdir) client = os.path.join(testdir, "client") print "starting client...", -clientPipe = os.popen(client + TestUtil.clientOptions + " " + testdir + " 2>&1", "r", 0) +clientPipe = os.popen(client + TestUtil.clientOptions + " " + testdir + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/cpp/test/FreezeScript/dbmap/run.py b/cpp/test/FreezeScript/dbmap/run.py index 7dc447481ab..6ed553d5279 100755 --- a/cpp/test/FreezeScript/dbmap/run.py +++ b/cpp/test/FreezeScript/dbmap/run.py @@ -64,7 +64,7 @@ for oldfile in files: command = transformdb + " --old " + os.path.join(directory, "fail", oldfile) + " --new " + os.path.join(directory, "fail", newfile) + " -o tmp.xml --key string --value " + value - stdin, stdout, stderr = os.popen3(command, "r", 0) + stdin, stdout, stderr = os.popen3(command) lines1 = stderr.readlines() lines2 = open(os.path.join(directory, "fail", oldfile.replace("_old.ice", ".err")), "r").readlines() if len(lines1) != len(lines2): @@ -111,7 +111,7 @@ print "executing default transformations... ", sys.stdout.flush() command = transformdb + " --old " + testold + " --new " + testnew + " --key int --value ::S " + init_dbdir + " default.db " + check_dbdir -stdin, stdout, stderr = os.popen3(command, "r", 0) +stdin, stdout, stderr = os.popen3(command) stderr.readlines() print "ok" diff --git a/cpp/test/FreezeScript/evictor/run.py b/cpp/test/FreezeScript/evictor/run.py index ddbd992e96c..8812a486cd8 100755 --- a/cpp/test/FreezeScript/evictor/run.py +++ b/cpp/test/FreezeScript/evictor/run.py @@ -54,7 +54,7 @@ print "executing evictor transformations... ", sys.stdout.flush() command = transformdb + " -e -p --old " + testold + " --new " + testnew + " -f " + transformxml + " " + dbdir + " evictor.db " + check_dbdir -stdin, stdout, stderr = os.popen3(command, "r", 0) +stdin, stdout, stderr = os.popen3(command) stderr.readlines() print "ok" diff --git a/cpp/test/Glacier/starter/run.py b/cpp/test/Glacier/starter/run.py index 77d27a05553..f1e8de06996 100755 --- a/cpp/test/Glacier/starter/run.py +++ b/cpp/test/Glacier/starter/run.py @@ -33,7 +33,7 @@ command = starter + TestUtil.clientServerOptions + \ r' --Glacier.Router.Server.Endpoints="tcp"' print "starting glacier starter...", -starterPipe = os.popen(command, "r", 0) +starterPipe = os.popen(command) TestUtil.getServerPid(starterPipe) TestUtil.getAdapterReady(starterPipe) print "ok" diff --git a/cpp/test/Ice/faultTolerance/TestI.cpp b/cpp/test/Ice/faultTolerance/TestI.cpp index 1f439c7ed7e..12551b866d8 100644 --- a/cpp/test/Ice/faultTolerance/TestI.cpp +++ b/cpp/test/Ice/faultTolerance/TestI.cpp @@ -24,19 +24,19 @@ TestI::shutdown(const Ice::Current&) void TestI::abort(const Ice::Current&) { - ::_exit(0); + exit(0); } void TestI::idempotentAbort(const Ice::Current&) { - ::_exit(0); + exit(0); } void TestI::nonmutatingAbort(const Ice::Current&) const { - ::_exit(0); + exit(0); } Ice::Int diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py index 2bb7dbd93c8..d3882612077 100755 --- a/cpp/test/Ice/faultTolerance/run.py +++ b/cpp/test/Ice/faultTolerance/run.py @@ -32,7 +32,7 @@ base = 12340 serverPipes = { } for i in range(0, num): print "starting server #%d..." % (i + 1), - serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + i) + " 2>&1", "r", 0) + serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + i) + " 2>&1") TestUtil.getServerPid(serverPipes[i]) TestUtil.getAdapterReady(serverPipes[i]) print "ok" @@ -41,7 +41,7 @@ ports = "" for i in range(0, num): ports = "%s %d" % (ports, base + i) print "starting client...", -clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports + " 2>&1", "r", 0) +clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/cpp/test/Ice/gc/run.py b/cpp/test/Ice/gc/run.py index da7677652a8..b9d43f19736 100755 --- a/cpp/test/Ice/gc/run.py +++ b/cpp/test/Ice/gc/run.py @@ -26,7 +26,7 @@ testdir = os.path.join(toplevel, "test", name) client = os.path.join(testdir, "client") print "starting client...", -clientPipe = os.popen(client + " 2>&1", "r", 0) +clientPipe = os.popen(client + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/cpp/test/IcePack/deployer/run.py b/cpp/test/IcePack/deployer/run.py index 4c6cdb8f65a..c8bed4755d1 100755 --- a/cpp/test/IcePack/deployer/run.py +++ b/cpp/test/IcePack/deployer/run.py @@ -44,7 +44,7 @@ def startClient(options): options print "starting client...", - clientPipe = os.popen(os.path.join(testdir, "client") + fullClientOptions + " 2>&1", "r", 0) + clientPipe = os.popen(os.path.join(testdir, "client") + fullClientOptions + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/cpp/test/IcePack/simple/run.py b/cpp/test/IcePack/simple/run.py index c76045c990b..c46ca420cab 100755 --- a/cpp/test/IcePack/simple/run.py +++ b/cpp/test/IcePack/simple/run.py @@ -68,7 +68,7 @@ IcePackAdmin.addServer(os.path.join(testdir, "simple_server.xml"), "test.dir=" + print "ok" print "starting client...", -clientPipe = os.popen(client + TestUtil.clientOptions + additionalOptions + " --with-deploy" + " 2>&1", "r", 0) +clientPipe = os.popen(client + TestUtil.clientOptions + additionalOptions + " --with-deploy" + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/run.py b/cpp/test/IceSSL/certificateAndKeyParsing/run.py index bcc36ad5452..6ba36e6e744 100755 --- a/cpp/test/IceSSL/certificateAndKeyParsing/run.py +++ b/cpp/test/IceSSL/certificateAndKeyParsing/run.py @@ -37,7 +37,7 @@ client = os.path.join(testdir, "certificateAndKeyParsing") localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost print "starting certificateAndKeyParsing...", -clientPipe = os.popen(client + localClientOptions + testOptions + " 2>&1", "r", 0) +clientPipe = os.popen(client + localClientOptions + testOptions + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/cpp/test/IceSSL/certificateVerifier/run.py b/cpp/test/IceSSL/certificateVerifier/run.py index d655539f6c5..2cfb1fdda42 100755 --- a/cpp/test/IceSSL/certificateVerifier/run.py +++ b/cpp/test/IceSSL/certificateVerifier/run.py @@ -31,7 +31,7 @@ client = os.path.join(testdir, "certificateVerifier") localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost print "starting certificateVerifier...", -clientPipe = os.popen(client + localClientOptions + " 2>&1", "r", 0) +clientPipe = os.popen(client + localClientOptions + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py index 4c42713c784..90bd44d0186 100755 --- a/cpp/test/IceSSL/configuration/run.py +++ b/cpp/test/IceSSL/configuration/run.py @@ -31,7 +31,7 @@ client = os.path.join(testdir, "configuration") localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost print "starting configuration...", -clientPipe = os.popen(client + localClientOptions + " 2>&1", "r", 0) +clientPipe = os.popen(client + localClientOptions + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/cpp/test/IceSSL/loadPEM/run.py b/cpp/test/IceSSL/loadPEM/run.py index 1548af46d23..89f0d37f0ba 100755 --- a/cpp/test/IceSSL/loadPEM/run.py +++ b/cpp/test/IceSSL/loadPEM/run.py @@ -36,7 +36,7 @@ client = os.path.join(testdir, "loadPEM") localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost print "starting loadPEM...", -clientPipe = os.popen(client + localClientOptions + testOptions + " 2>&1", "r", 0) +clientPipe = os.popen(client + localClientOptions + testOptions + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py index 7fd5068111d..78be1985e54 100755 --- a/cpp/test/IceStorm/federation/run.py +++ b/cpp/test/IceStorm/federation/run.py @@ -62,7 +62,7 @@ def doTest(batch): print "starting " + name + "...", command = subscriber + batchOptions + TestUtil.clientServerOptions + iceStormReference + r' ' + subscriberLockFile + " 2>&1" - subscriberPipe = os.popen(command, "r", 0) + subscriberPipe = os.popen(command) TestUtil.getServerPid(subscriberPipe) TestUtil.getAdapterReady(subscriberPipe) print "ok" @@ -84,7 +84,7 @@ def doTest(batch): # print "starting publisher...", command = publisher + TestUtil.clientOptions + iceStormReference + " 2>&1" - publisherPipe = os.popen(command, "r", 0) + publisherPipe = os.popen(command) print "ok" TestUtil.printOutputFromPipe(publisherPipe) @@ -114,14 +114,14 @@ iceStormDBEnv=" --Freeze.DbEnv.IceStorm.DbHome=" + dbHome print "starting icestorm service...", command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv + " 2>&1" -iceBoxPipe = os.popen(command, "r", 0) +iceBoxPipe = os.popen(command) TestUtil.getServerPid(iceBoxPipe) TestUtil.waitServiceReady(iceBoxPipe, "IceStorm") print "ok" print "creating topics...", command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create fed1 fed2 fed3"' + " 2>&1" -iceStormAdminPipe = os.popen(command, "r", 0) +iceStormAdminPipe = os.popen(command) iceStormAdminStatus = iceStormAdminPipe.close() if iceStormAdminStatus: TestUtil.killServers() @@ -130,13 +130,13 @@ print "ok" print "linking topics...", command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "link fed1 fed2 10"' + " 2>&1" -iceStormAdminPipe = os.popen(command, "r", 0) +iceStormAdminPipe = os.popen(command) iceStormAdminStatus = iceStormAdminPipe.close() if iceStormAdminStatus: TestUtil.killServers() sys.exit(1) command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "link fed2 fed3 5"' + " 2>&1" -iceStormAdminPipe = os.popen(command, "r", 0) +iceStormAdminPipe = os.popen(command) iceStormAdminStatus = iceStormAdminPipe.close() if iceStormAdminStatus: TestUtil.killServers() @@ -158,7 +158,7 @@ batchStatus = doTest(1) # print "destroying topics...", command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed1 fed2 fed3"' + " 2>&1" -iceStormAdminPipe = os.popen(command, "r", 0) +iceStormAdminPipe = os.popen(command) iceStormAdminStatus = iceStormAdminPipe.close() if iceStormAdminStatus: TestUtil.killServers() @@ -170,7 +170,7 @@ print "ok" # print "shutting down icestorm service...", command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown' + " 2>&1" -iceBoxAdminPipe = os.popen(command, "r", 0) +iceBoxAdminPipe = os.popen(command) iceBoxAdminStatus = iceBoxAdminPipe.close() if iceBoxAdminStatus: TestUtil.killServers() diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py index 0f239ca7f28..3b23c919088 100755 --- a/cpp/test/IceStorm/federation2/run.py +++ b/cpp/test/IceStorm/federation2/run.py @@ -64,7 +64,7 @@ def doTest(batch): print "starting " + name + "...", command = subscriber + batchOptions + TestUtil.clientServerOptions + iceStormReference + r' ' + subscriberLockFile + " 2>&1" - subscriberPipe = os.popen(command, "r", 0) + subscriberPipe = os.popen(command) TestUtil.getServerPid(subscriberPipe) TestUtil.getAdapterReady(subscriberPipe) print "ok" @@ -86,7 +86,7 @@ def doTest(batch): # print "starting publisher...", command = publisher + TestUtil.clientOptions + iceStormReference + " 2>&1" - publisherPipe = os.popen(command, "r", 0) + publisherPipe = os.popen(command) print "ok" TestUtil.printOutputFromPipe(publisherPipe) @@ -116,14 +116,14 @@ iceStormDBEnv=" --Freeze.DbEnv.IceStorm.DbHome=" + dbHome print "starting icestorm service...", command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv + " 2>&1" -iceBoxPipe = os.popen(command, "r", 0) +iceBoxPipe = os.popen(command) TestUtil.getServerPid(iceBoxPipe) TestUtil.waitServiceReady(iceBoxPipe, "IceStorm") print "ok" print "creating topics...", command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create fed1 fed2 fed3"' + " 2>&1" -iceStormAdminPipe = os.popen(command, "r", 0) +iceStormAdminPipe = os.popen(command) iceStormAdminStatus = iceStormAdminPipe.close() if iceStormAdminStatus: TestUtil.killServers() @@ -133,7 +133,7 @@ print "ok" print "linking topics...", graph = os.path.join(testdir, "fed.xml"); command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "graph ' + graph + r' 10"' + " 2>&1" -iceStormAdminPipe = os.popen(command, "r", 0) +iceStormAdminPipe = os.popen(command) # # The graph command generates output. We must read it otherwise # closing the pipe might return a non-zero status. @@ -161,7 +161,7 @@ batchStatus = doTest(1) # print "destroying topics...", command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed1 fed2 fed3"' + " 2>&1" -iceStormAdminPipe = os.popen(command, "r", 0) +iceStormAdminPipe = os.popen(command) iceStormAdminStatus = iceStormAdminPipe.close() if iceStormAdminStatus: TestUtil.killServers() @@ -173,7 +173,7 @@ print "ok" # print "shutting down icestorm service...", command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown' + " 2>&1" -iceBoxAdminPipe = os.popen(command, "r", 0) +iceBoxAdminPipe = os.popen(command) iceBoxAdminStatus = iceBoxAdminPipe.close() if iceBoxAdminStatus: TestUtil.killServers() diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py index b30ac9a4cfe..838b1362fc9 100755 --- a/cpp/test/IceStorm/single/run.py +++ b/cpp/test/IceStorm/single/run.py @@ -42,7 +42,7 @@ iceStormDBEnv=" --Freeze.DbEnv.IceStorm.DbHome=" + dbHome print "starting icestorm service...", command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv + " 2>&1" -iceBoxPipe = os.popen(command, "r", 0) +iceBoxPipe = os.popen(command) TestUtil.getServerPid(iceBoxPipe) #TestUtil.getAdapterReady(iceBoxPipe) TestUtil.waitServiceReady(iceBoxPipe, "IceStorm") @@ -50,7 +50,7 @@ print "ok" print "creating topic...", command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create single"' + " 2>&1" -iceStormAdminPipe = os.popen(command, "r", 0) +iceStormAdminPipe = os.popen(command) iceStormAdminStatus = iceStormAdminPipe.close() if iceStormAdminStatus: TestUtil.killServers() @@ -72,7 +72,7 @@ except: print "starting subscriber...", command = subscriber + TestUtil.clientServerOptions + iceStormReference + r' ' + subscriberLockFile + " 2>&1" -subscriberPipe = os.popen(command, "r", 0) +subscriberPipe = os.popen(command) TestUtil.getServerPid(subscriberPipe) TestUtil.getAdapterReady(subscriberPipe) print "ok" @@ -90,7 +90,7 @@ print "ok" # print "starting publisher...", command = publisher + TestUtil.clientOptions + iceStormReference + " 2>&1" -publisherPipe = os.popen(command, "r", 0) +publisherPipe = os.popen(command) print "ok" TestUtil.printOutputFromPipe(publisherPipe); @@ -114,7 +114,7 @@ print "ok" # print "destroying topic...", command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy single"' + " 2>&1" -iceStormAdminPipe = os.popen(command, "r", 0) +iceStormAdminPipe = os.popen(command) iceStormAdminStatus = iceStormAdminPipe.close() if iceStormAdminStatus: TestUtil.killServers() @@ -126,7 +126,7 @@ print "ok" # print "shutting down icestorm service...", command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown' + " 2>&1" -iceBoxAdminPipe = os.popen(command, "r", 0) +iceBoxAdminPipe = os.popen(command) iceBoxAdminStatus = iceBoxAdminPipe.close() if iceBoxAdminStatus: TestUtil.killServers() diff --git a/cpp/test/IceUtil/inputUtil/run.py b/cpp/test/IceUtil/inputUtil/run.py index 589826e2ff7..95ef6336e1f 100755 --- a/cpp/test/IceUtil/inputUtil/run.py +++ b/cpp/test/IceUtil/inputUtil/run.py @@ -27,7 +27,7 @@ client = os.path.join(testdir, "client") clientOptions = ' ' + testdir; print "starting client...", -clientPipe = os.popen(client + clientOptions + " 2>&1", "r", 0) +clientPipe = os.popen(client + clientOptions + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe); diff --git a/cpp/test/IceUtil/thread/run.py b/cpp/test/IceUtil/thread/run.py index d0b2e07efec..6612d951f75 100755 --- a/cpp/test/IceUtil/thread/run.py +++ b/cpp/test/IceUtil/thread/run.py @@ -27,7 +27,7 @@ client = os.path.join(testdir, "client") clientOptions = ' ' + testdir; print "starting client...", -clientPipe = os.popen(client + clientOptions + " 2>&1", "r", 0) +clientPipe = os.popen(client + clientOptions + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe); diff --git a/cpp/test/IceUtil/unicode/run.py b/cpp/test/IceUtil/unicode/run.py index 24d86d22121..0d92699dc5b 100755 --- a/cpp/test/IceUtil/unicode/run.py +++ b/cpp/test/IceUtil/unicode/run.py @@ -41,7 +41,7 @@ file.close(); print "ok" print "starting client...", -clientPipe = os.popen(client + clientOptions + " 2>&1", "r", 0) +clientPipe = os.popen(client + clientOptions + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe); diff --git a/cpp/test/IceUtil/uuid/run.py b/cpp/test/IceUtil/uuid/run.py index 646c125bba5..75ca25ec8ea 100755 --- a/cpp/test/IceUtil/uuid/run.py +++ b/cpp/test/IceUtil/uuid/run.py @@ -26,7 +26,7 @@ testdir = os.path.join(toplevel, "test", name) client = os.path.join(testdir, "client") print "starting client...", -clientPipe = os.popen(client + " 2>&1", "r", 0) +clientPipe = os.popen(client + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe); diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py index 7ecae19ef0e..ce6a0c337ae 100755 --- a/cpp/test/Slice/errorDetection/run.py +++ b/cpp/test/Slice/errorDetection/run.py @@ -42,7 +42,7 @@ for file in files: command = slice2cpp + " --case-sensitive -I. " + os.path.join(directory, file); else: command = slice2cpp + " -I. " + os.path.join(directory, file); - stdin, stdout, stderr = os.popen3(command, "r", 0) + stdin, stdout, stderr = os.popen3(command) lines1 = stdout.readlines() lines2 = open(os.path.join(directory, regex1.sub(".err", file)), "r").readlines() if len(lines1) != len(lines2): diff --git a/cs/config/TestUtil.py b/cs/config/TestUtil.py index 4e3247c11b4..d3650af006f 100644 --- a/cs/config/TestUtil.py +++ b/cs/config/TestUtil.py @@ -193,13 +193,13 @@ def clientServerTestWithOptionsAndNames(name, additionalServerOptions, additiona client = os.path.join(testdir, clientName) print "starting " + serverName + "...", - serverPipe = os.popen(server + serverOptions + " " + additionalServerOptions, "r", 0) + serverPipe = os.popen(server + serverOptions + " " + additionalServerOptions) getServerPid(serverPipe) getAdapterReady(serverPipe) print "ok" print "starting " + clientName + "...", - clientPipe = os.popen(client + clientOptions + " " + additionalClientOptions, "r", 0) + clientPipe = os.popen(client + clientOptions + " " + additionalClientOptions) print "ok" printOutputFromPipe(clientPipe) @@ -226,13 +226,13 @@ def mixedClientServerTestWithOptions(name, additionalServerOptions, additionalCl client = os.path.join(testdir, "client") print "starting server...", - serverPipe = os.popen(server + clientServerOptions + " " + additionalServerOptions, "r", 0) + serverPipe = os.popen(server + clientServerOptions + " " + additionalServerOptions) getServerPid(serverPipe) getAdapterReady(serverPipe) print "ok" print "starting client...", - clientPipe = os.popen(client + clientServerOptions + " " + additionalClientOptions, "r", 0) + clientPipe = os.popen(client + clientServerOptions + " " + additionalClientOptions) getServerPid(clientPipe) getAdapterReady(clientPipe) print "ok" @@ -256,7 +256,7 @@ def collocatedTestWithOptions(name, additionalOptions): collocated = os.path.join(testdir, "collocated") print "starting collocated...", - collocatedPipe = os.popen(collocated + collocatedOptions + " " + additionalOptions, "r", 0) + collocatedPipe = os.popen(collocated + collocatedOptions + " " + additionalOptions) print "ok" printOutputFromPipe(collocatedPipe) diff --git a/cs/test/Ice/faultTolerance/run.py b/cs/test/Ice/faultTolerance/run.py index 92034e7e410..4fd10d4a0df 100755 --- a/cs/test/Ice/faultTolerance/run.py +++ b/cs/test/Ice/faultTolerance/run.py @@ -32,7 +32,7 @@ base = 12340 serverPipes = { } for i in range(0, num): print "starting server #%d..." % (i + 1), - serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + i), "r", 0) + serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + i)) TestUtil.getServerPid(serverPipes[i]) TestUtil.getAdapterReady(serverPipes[i]) print "ok" @@ -42,7 +42,7 @@ for i in range(0, num): ports = "%s %d" % (ports, base + i) print "starting client...", -clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports, "r", 0) +clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports) print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/java/config/IcePackAdmin.py b/java/config/IcePackAdmin.py index 0b9670ee976..ad58d936268 100644 --- a/java/config/IcePackAdmin.py +++ b/java/config/IcePackAdmin.py @@ -62,7 +62,7 @@ def startIcePackRegistry(port, testdir): r' --IcePack.Registry.DynamicRegistration' + \ r' --Ice.ProgramName=icepackregistry' - (stdin, icePackPipe) = os.popen4(command, "r", 0) + (stdin, icePackPipe) = os.popen4(command) TestUtil.getAdapterReady(icePackPipe) TestUtil.getAdapterReady(icePackPipe) TestUtil.getAdapterReady(icePackPipe) @@ -97,7 +97,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.getAdapterReady(icePackPipe) TestUtil.waitServiceReady(icePackPipe, 'node') print "ok" @@ -116,7 +116,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: @@ -134,7 +134,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: @@ -152,7 +152,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: @@ -169,7 +169,7 @@ def removeApplication(descriptor): r' "--Ice.Default.Locator=IcePack/Locator:default -p ' + icePackPort + '" ' + \ r' -e "application remove \"' + descriptor + '\\" \"' + " 2>&1" - icePackAdminPipe = os.popen(command, "r", 0) + icePackAdminPipe = os.popen(command) TestUtil.printOutputFromPipe(icePackAdminPipe) icePackAdminStatus = icePackAdminPipe.close() if icePackAdminStatus: @@ -187,7 +187,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: @@ -203,7 +203,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) TestUtil.printOutputFromPipe(icePackAdminPipe) icePackAdminStatus = icePackAdminPipe.close() if icePackAdminStatus: @@ -219,7 +219,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) TestUtil.printOutputFromPipe(icePackAdminPipe) icePackAdminStatus = icePackAdminPipe.close() if icePackAdminStatus: @@ -235,7 +235,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): diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py index 893e3fe2fda..d839adceff7 100644 --- a/java/config/TestUtil.py +++ b/java/config/TestUtil.py @@ -169,12 +169,12 @@ def clientServerTestWithOptions(additionalServerOptions, additionalClientOptions client = "java -ea Client --Ice.ProgramName=Client " print "starting server...", - serverPipe = os.popen(server + serverOptions + additionalServerOptions + " 2>&1", "r", 0) + serverPipe = os.popen(server + serverOptions + additionalServerOptions + " 2>&1") getAdapterReady(serverPipe) print "ok" print "starting client...", - clientPipe = os.popen(client + clientOptions + additionalClientOptions + " 2>&1", "r", 0) + clientPipe = os.popen(client + clientOptions + additionalClientOptions + " 2>&1") print "ok" #printOutputFromPipe(serverPipe) @@ -198,14 +198,14 @@ def clientServerTestWithClasspath(serverClasspath, clientClasspath): print "starting server...", os.environ["CLASSPATH"] = scp - serverPipe = os.popen(server + serverOptions + " 2>&1", "r", 0) + serverPipe = os.popen(server + serverOptions + " 2>&1") os.environ["CLASSPATH"] = classpath getAdapterReady(serverPipe) print "ok" print "starting client...", os.environ["CLASSPATH"] = ccp - clientPipe = os.popen(client + clientOptions + " 2>&1", "r", 0) + clientPipe = os.popen(client + clientOptions + " 2>&1") os.environ["CLASSPATH"] = classpath print "ok" @@ -229,12 +229,12 @@ def mixedClientServerTestWithOptions(additionalServerOptions, additionalClientOp client = "java -ea Client --Ice.ProgramName=Client " print "starting server...", - serverPipe = os.popen(server + serverOptions + additionalServerOptions + " 2>&1", "r", 0) + serverPipe = os.popen(server + serverOptions + additionalServerOptions + " 2>&1") getAdapterReady(serverPipe) print "ok" print "starting client...", - clientPipe = os.popen(client + clientOptions + additionalClientOptions + " 2>&1", "r", 0) + clientPipe = os.popen(client + clientOptions + additionalClientOptions + " 2>&1") print "ok" printOutputFromPipe(clientPipe) @@ -255,7 +255,7 @@ def collocatedTestWithOptions(additionalOptions): collocated = "java -ea Collocated --Ice.ProgramName=Collocated " print "starting collocated...", - collocatedPipe = os.popen(collocated + collocatedOptions + additionalOptions + " 2>&1", "r", 0) + collocatedPipe = os.popen(collocated + collocatedOptions + additionalOptions + " 2>&1") print "ok" printOutputFromPipe(collocatedPipe) diff --git a/java/test/Freeze/complex/run.py b/java/test/Freeze/complex/run.py index ae695fb341b..88b44489485 100755 --- a/java/test/Freeze/complex/run.py +++ b/java/test/Freeze/complex/run.py @@ -33,7 +33,7 @@ TestUtil.cleanDbDir(dbdir) client = "java -ea Client" print "starting populate...", -populatePipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " populate" + " 2>&1", "r", 0) +populatePipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " populate" + " 2>&1") print "ok" TestUtil.printOutputFromPipe(populatePipe) @@ -44,7 +44,7 @@ if populateStatus: sys.exit(1) print "starting verification client...", -clientPipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " validate" + " 2>&1", "r", 0) +clientPipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " validate" + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/java/test/Freeze/dbmap/run.py b/java/test/Freeze/dbmap/run.py index d2c0147b9cf..9b45501ea29 100755 --- a/java/test/Freeze/dbmap/run.py +++ b/java/test/Freeze/dbmap/run.py @@ -30,7 +30,7 @@ TestUtil.cleanDbDir(dbdir) client = "java -ea Client" print "starting client...", -clientPipe = os.popen(client + TestUtil.clientOptions + " " + testdir + " 2>&1", "r", 0) +clientPipe = os.popen(client + TestUtil.clientOptions + " " + testdir + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/java/test/Glacier/starter/run.py b/java/test/Glacier/starter/run.py index 00a45514ac4..e083ec39d67 100755 --- a/java/test/Glacier/starter/run.py +++ b/java/test/Glacier/starter/run.py @@ -40,7 +40,7 @@ command = starter + TestUtil.clientServerOptions + \ r' --Glacier.Router.Server.Endpoints="tcp"' + " 2>&1" print "starting glacier starter...", -starterPipe = os.popen(command, "r", 0) +starterPipe = os.popen(command) TestUtil.getServerPid(starterPipe) TestUtil.getAdapterReady(starterPipe) print "ok" diff --git a/java/test/Ice/exceptions/run.py b/java/test/Ice/exceptions/run.py index d0c706a8212..4a8b0473027 100755 --- a/java/test/Ice/exceptions/run.py +++ b/java/test/Ice/exceptions/run.py @@ -36,13 +36,13 @@ client = "java -ea Client --Ice.ProgramName=Client " print "starting server...", classpath = os.getenv("CLASSPATH", "") os.environ["CLASSPATH"] = os.path.join(testdirAMD, "classes") + TestUtil.sep + classpath -serverPipe = os.popen(server + TestUtil.serverOptions + " 2>&1", "r", 0) +serverPipe = os.popen(server + TestUtil.serverOptions + " 2>&1") TestUtil.getAdapterReady(serverPipe) print "ok" print "starting client...", classpath = os.getenv("CLASSPATH", "") os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + classpath -(clientPipeIn, clientPipe) = os.popen4(client + TestUtil.clientOptions + " --Ice.Warn.Connections=0", "r", 0) +(clientPipeIn, clientPipe) = os.popen4(client + TestUtil.clientOptions + " --Ice.Warn.Connections=0") print "ok" TestUtil.printOutputFromPipe(clientPipe) clientStatus = clientPipe.close() diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/Ice/faultTolerance/run.py index 7fc1fcaaff5..5bb1088e915 100755 --- a/java/test/Ice/faultTolerance/run.py +++ b/java/test/Ice/faultTolerance/run.py @@ -33,7 +33,7 @@ base = 12340 serverPipes = { } for i in range(0, num): print "starting server #%d..." % (i + 1), - serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + i) + " 2>&1", "r", 0) + serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + i) + " 2>&1") TestUtil.getAdapterReady(serverPipes[i]) print "ok" @@ -41,7 +41,7 @@ ports = "" for i in range(0, num): ports = "%s %d" % (ports, base + i) print "starting client...", -clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports + " 2>&1", "r", 0) +clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/java/test/Ice/operations/run.py b/java/test/Ice/operations/run.py index b0dd7a386d9..c19c8b15ba4 100755 --- a/java/test/Ice/operations/run.py +++ b/java/test/Ice/operations/run.py @@ -36,13 +36,13 @@ client = "java -ea Client --Ice.ProgramName=Client " print "starting server...", classpath = os.getenv("CLASSPATH", "") os.environ["CLASSPATH"] = os.path.join(testdirAMD, "classes") + TestUtil.sep + classpath -serverPipe = os.popen(server + TestUtil.serverOptions + " 2>&1", "r", 0) +serverPipe = os.popen(server + TestUtil.serverOptions + " 2>&1") TestUtil.getAdapterReady(serverPipe) print "ok" print "starting client...", classpath = os.getenv("CLASSPATH", "") os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + classpath -clientPipe = os.popen(client + TestUtil.clientOptions + " 2>&1", "r", 0) +clientPipe = os.popen(client + TestUtil.clientOptions + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) clientStatus = clientPipe.close() diff --git a/java/test/IcePack/deployer/run.py b/java/test/IcePack/deployer/run.py index ac013dfbacb..3a21db30857 100755 --- a/java/test/IcePack/deployer/run.py +++ b/java/test/IcePack/deployer/run.py @@ -40,7 +40,7 @@ def startClient(options): print "starting client...", - clientPipe = os.popen("java -ea Client " + fullClientOptions + " 2>&1", "r", 0) + clientPipe = os.popen("java -ea Client " + fullClientOptions + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) diff --git a/java/test/IcePack/simple/run.py b/java/test/IcePack/simple/run.py index 612762bdfb5..e0f15f07960 100755 --- a/java/test/IcePack/simple/run.py +++ b/java/test/IcePack/simple/run.py @@ -72,7 +72,7 @@ IcePackAdmin.addServer(os.path.join(testdir, "simple_server.xml"), "test.dir=" + print "ok" print "starting client...", -clientPipe = os.popen(client + TestUtil.clientOptions + additionalOptions + " --with-deploy" + " 2>&1", "r", 0) +clientPipe = os.popen(client + TestUtil.clientOptions + additionalOptions + " --with-deploy" + " 2>&1") print "ok" TestUtil.printOutputFromPipe(clientPipe) |