summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test')
-rwxr-xr-xcpp/test/Freeze/complex/run.py4
-rwxr-xr-xcpp/test/Freeze/dbmap/run.py2
-rwxr-xr-xcpp/test/FreezeScript/dbmap/run.py4
-rwxr-xr-xcpp/test/FreezeScript/evictor/run.py2
-rwxr-xr-xcpp/test/Glacier/starter/run.py2
-rw-r--r--cpp/test/Ice/faultTolerance/TestI.cpp6
-rwxr-xr-xcpp/test/Ice/faultTolerance/run.py4
-rwxr-xr-xcpp/test/Ice/gc/run.py2
-rwxr-xr-xcpp/test/IcePack/deployer/run.py2
-rwxr-xr-xcpp/test/IcePack/simple/run.py2
-rwxr-xr-xcpp/test/IceSSL/certificateAndKeyParsing/run.py2
-rwxr-xr-xcpp/test/IceSSL/certificateVerifier/run.py2
-rwxr-xr-xcpp/test/IceSSL/configuration/run.py2
-rwxr-xr-xcpp/test/IceSSL/loadPEM/run.py2
-rwxr-xr-xcpp/test/IceStorm/federation/run.py16
-rwxr-xr-xcpp/test/IceStorm/federation2/run.py14
-rwxr-xr-xcpp/test/IceStorm/single/run.py12
-rwxr-xr-xcpp/test/IceUtil/inputUtil/run.py2
-rwxr-xr-xcpp/test/IceUtil/thread/run.py2
-rwxr-xr-xcpp/test/IceUtil/unicode/run.py2
-rwxr-xr-xcpp/test/IceUtil/uuid/run.py2
-rwxr-xr-xcpp/test/Slice/errorDetection/run.py2
22 files changed, 45 insertions, 45 deletions
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):
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:38:51 +0000