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/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
17 files changed, 37 insertions, 37 deletions
diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py
index 1ff97a9e9db..d5689ed59c1 100755
--- a/cpp/test/Freeze/complex/run.py
+++ b/cpp/test/Freeze/complex/run.py
@@ -37,7 +37,7 @@ TestUtil.cleanDbDir(dbdir)
client = os.path.join(testdir, "client")
print "starting populate...",
-populatePipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " populate")
+populatePipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " populate" + " 2>&1")
print "ok"
TestUtil.printOutputFromPipe(populatePipe)
@@ -48,7 +48,7 @@ if populateStatus:
sys.exit(1)
print "starting verification client...",
-clientPipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " validate")
+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 11326f5e93d..fdfd3b8ffc9 100755
--- a/cpp/test/Freeze/dbmap/run.py
+++ b/cpp/test/Freeze/dbmap/run.py
@@ -34,7 +34,7 @@ TestUtil.cleanDbDir(dbdir)
client = os.path.join(testdir, "client")
print "starting client...",
-clientPipe = os.popen(client + TestUtil.clientOptions + " " + testdir)
+clientPipe = os.popen(client + TestUtil.clientOptions + " " + testdir + " 2>&1")
print "ok"
TestUtil.printOutputFromPipe(clientPipe)
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index 9fc15d03c78..f49d02fc595 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -37,7 +37,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))
+ serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + i) + " 2>&1")
TestUtil.getServerPid(serverPipes[i])
TestUtil.getAdapterReady(serverPipes[i])
print "ok"
@@ -46,7 +46,7 @@ ports = ""
for i in range(0, num):
ports = "%s %d" % (ports, base + i)
print "starting client...",
-clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports)
+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 c243315755e..2843d24574c 100755
--- a/cpp/test/Ice/gc/run.py
+++ b/cpp/test/Ice/gc/run.py
@@ -31,7 +31,7 @@ testdir = os.path.join(toplevel, "test", name)
client = os.path.join(testdir, "client")
print "starting client...",
-clientPipe = os.popen(client)
+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 7b9183d0fab..64c46ada2eb 100755
--- a/cpp/test/IcePack/deployer/run.py
+++ b/cpp/test/IcePack/deployer/run.py
@@ -47,7 +47,7 @@ def startClient(options):
options
print "starting client...",
- clientPipe = os.popen(os.path.join(testdir, "client") + fullClientOptions)
+ 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 56a456a38d6..119d32359a2 100755
--- a/cpp/test/IcePack/simple/run.py
+++ b/cpp/test/IcePack/simple/run.py
@@ -73,7 +73,7 @@ IcePackAdmin.addServer("server", os.path.join(testdir, "simple_server.xml"), ser
print "ok"
print "starting client...",
-clientPipe = os.popen(client + TestUtil.clientOptions + additionalOptions + " --with-deploy")
+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 d0aaced503b..8360dcc5000 100755
--- a/cpp/test/IceSSL/certificateAndKeyParsing/run.py
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
@@ -42,7 +42,7 @@ client = os.path.join(testdir, "certificateAndKeyParsing")
localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
print "starting certificateAndKeyParsing...",
-clientPipe = os.popen(client + localClientOptions + testOptions)
+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 af63abb3e9e..44b6ed69667 100755
--- a/cpp/test/IceSSL/certificateVerifier/run.py
+++ b/cpp/test/IceSSL/certificateVerifier/run.py
@@ -36,7 +36,7 @@ client = os.path.join(testdir, "certificateVerifier")
localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
print "starting certificateVerifier...",
-clientPipe = os.popen(client + localClientOptions)
+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 39b8edd3b6e..4b74edab0d4 100755
--- a/cpp/test/IceSSL/configuration/run.py
+++ b/cpp/test/IceSSL/configuration/run.py
@@ -36,7 +36,7 @@ client = os.path.join(testdir, "configuration")
localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
print "starting configuration...",
-clientPipe = os.popen(client + localClientOptions)
+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 eb7517bb2f6..18760b91ce8 100755
--- a/cpp/test/IceSSL/loadPEM/run.py
+++ b/cpp/test/IceSSL/loadPEM/run.py
@@ -41,7 +41,7 @@ client = os.path.join(testdir, "loadPEM")
localClientOptions = TestUtil.clientServerProtocol + TestUtil.defaultHost
print "starting loadPEM...",
-clientPipe = os.popen(client + localClientOptions + testOptions)
+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 120710da820..7ec9e6fb61a 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -66,7 +66,7 @@ def doTest(batch):
pass # Ignore errors if the lockfile is not present
print "starting " + name + "...",
- command = subscriber + batchOptions + TestUtil.clientServerOptions + iceStormReference + r' ' + subscriberLockFile
+ command = subscriber + batchOptions + TestUtil.clientServerOptions + iceStormReference + r' ' + subscriberLockFile + " 2>&1"
subscriberPipe = os.popen(command)
TestUtil.getServerPid(subscriberPipe)
TestUtil.getAdapterReady(subscriberPipe)
@@ -88,7 +88,7 @@ def doTest(batch):
# causes subscriber to terminate.
#
print "starting publisher...",
- command = publisher + TestUtil.clientOptions + iceStormReference
+ command = publisher + TestUtil.clientOptions + iceStormReference + " 2>&1"
publisherPipe = os.popen(command)
print "ok"
@@ -118,14 +118,14 @@ TestUtil.cleanDbDir(dbEnvName)
iceStormDBEnv=" --IceBox.DBEnvName.IceStorm=" + dbEnvName
print "starting icestorm service...",
-command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv
+command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv + " 2>&1"
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"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create fed1 fed2 fed3"' + " 2>&1"
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -134,13 +134,13 @@ if iceStormAdminStatus:
print "ok"
print "linking topics...",
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "link fed1 fed2 10"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "link fed1 fed2 10"' + " 2>&1"
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"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "link fed2 fed3 5"' + " 2>&1"
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -162,7 +162,7 @@ batchStatus = doTest(1)
# Destroy the topics.
#
print "destroying topics...",
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed1 fed2 fed3"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed1 fed2 fed3"' + " 2>&1"
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -174,7 +174,7 @@ print "ok"
# Shutdown icestorm.
#
print "shutting down icestorm service...",
-command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown'
+command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown' + " 2>&1"
iceBoxAdminPipe = os.popen(command)
iceBoxAdminStatus = iceBoxAdminPipe.close()
if iceBoxAdminStatus:
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index 0d8f087476b..2e9e30f0c76 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -68,7 +68,7 @@ def doTest(batch):
pass # Ignore errors if the lockfile is not present
print "starting " + name + "...",
- command = subscriber + batchOptions + TestUtil.clientServerOptions + iceStormReference + r' ' + subscriberLockFile
+ command = subscriber + batchOptions + TestUtil.clientServerOptions + iceStormReference + r' ' + subscriberLockFile + " 2>&1"
subscriberPipe = os.popen(command)
TestUtil.getServerPid(subscriberPipe)
TestUtil.getAdapterReady(subscriberPipe)
@@ -90,7 +90,7 @@ def doTest(batch):
# causes subscriber to terminate.
#
print "starting publisher...",
- command = publisher + TestUtil.clientOptions + iceStormReference
+ command = publisher + TestUtil.clientOptions + iceStormReference + " 2>&1"
publisherPipe = os.popen(command)
print "ok"
@@ -120,14 +120,14 @@ TestUtil.cleanDbDir(dbEnvName)
iceStormDBEnv = " --IceBox.DBEnvName.IceStorm=" + dbEnvName
print "starting icestorm service...",
-command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv
+command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv + " 2>&1"
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"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create fed1 fed2 fed3"' + " 2>&1"
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -137,7 +137,7 @@ print "ok"
print "linking topics...",
graph = os.path.join(testdir, "fed.xml");
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "graph ' + graph + r' 10"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "graph ' + graph + r' 10"' + " 2>&1"
iceStormAdminPipe = os.popen(command)
#
# The graph command generates output. We must read it otherwise
@@ -165,7 +165,7 @@ batchStatus = doTest(1)
# Destroy the topic.
#
print "destroying topics...",
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed1 fed2 fed3"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy fed1 fed2 fed3"' + " 2>&1"
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -177,7 +177,7 @@ print "ok"
# Shutdown icestorm.
#
print "shutting down icestorm service...",
-command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown'
+command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown' + " 2>&1"
iceBoxAdminPipe = os.popen(command)
iceBoxAdminStatus = iceBoxAdminPipe.close()
if iceBoxAdminStatus:
diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py
index 3a39ce4415a..f5d183ce87a 100755
--- a/cpp/test/IceStorm/single/run.py
+++ b/cpp/test/IceStorm/single/run.py
@@ -46,7 +46,7 @@ TestUtil.cleanDbDir(dbEnvName)
iceStormDBEnv=" --IceBox.DBEnvName.IceStorm=" + dbEnvName
print "starting icestorm service...",
-command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv
+command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv + " 2>&1"
iceBoxPipe = os.popen(command)
TestUtil.getServerPid(iceBoxPipe)
#TestUtil.getAdapterReady(iceBoxPipe)
@@ -54,7 +54,7 @@ TestUtil.waitServiceReady(iceBoxPipe, "IceStorm")
print "ok"
print "creating topic...",
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create single"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "create single"' + " 2>&1"
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -76,7 +76,7 @@ except:
pass # Ignore errors if the lockfile is not present
print "starting subscriber...",
-command = subscriber + TestUtil.clientServerOptions + iceStormReference + r' ' + subscriberLockFile
+command = subscriber + TestUtil.clientServerOptions + iceStormReference + r' ' + subscriberLockFile + " 2>&1"
subscriberPipe = os.popen(command)
TestUtil.getServerPid(subscriberPipe)
TestUtil.getAdapterReady(subscriberPipe)
@@ -94,7 +94,7 @@ print "ok"
# causes subscriber to terminate.
#
print "starting publisher...",
-command = publisher + TestUtil.clientOptions + iceStormReference
+command = publisher + TestUtil.clientOptions + iceStormReference + " 2>&1"
publisherPipe = os.popen(command)
print "ok"
@@ -118,7 +118,7 @@ print "ok"
# Destroy the topic.
#
print "destroying topic...",
-command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy single"'
+command = iceStormAdmin + TestUtil.clientOptions + iceStormReference + r' -e "destroy single"' + " 2>&1"
iceStormAdminPipe = os.popen(command)
iceStormAdminStatus = iceStormAdminPipe.close()
if iceStormAdminStatus:
@@ -130,7 +130,7 @@ print "ok"
# Shutdown icestorm.
#
print "shutting down icestorm service...",
-command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown'
+command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown' + " 2>&1"
iceBoxAdminPipe = os.popen(command)
iceBoxAdminStatus = iceBoxAdminPipe.close()
if iceBoxAdminStatus:
diff --git a/cpp/test/IceUtil/inputUtil/run.py b/cpp/test/IceUtil/inputUtil/run.py
index 1fc265bffe1..1476ce6470a 100755
--- a/cpp/test/IceUtil/inputUtil/run.py
+++ b/cpp/test/IceUtil/inputUtil/run.py
@@ -32,7 +32,7 @@ client = os.path.join(testdir, "client")
clientOptions = ' ' + testdir;
print "starting client...",
-clientPipe = os.popen(client + clientOptions)
+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 0ea120b1c54..876a014b6a5 100755
--- a/cpp/test/IceUtil/thread/run.py
+++ b/cpp/test/IceUtil/thread/run.py
@@ -32,7 +32,7 @@ client = os.path.join(testdir, "client")
clientOptions = ' ' + testdir;
print "starting client...",
-clientPipe = os.popen(client + clientOptions)
+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 6081f6235ee..2b6251ab237 100755
--- a/cpp/test/IceUtil/unicode/run.py
+++ b/cpp/test/IceUtil/unicode/run.py
@@ -46,7 +46,7 @@ file.close();
print "ok"
print "starting client...",
-clientPipe = os.popen(client + clientOptions)
+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 2fa3a69594c..c409ff641c1 100755
--- a/cpp/test/IceUtil/uuid/run.py
+++ b/cpp/test/IceUtil/uuid/run.py
@@ -31,7 +31,7 @@ testdir = os.path.join(toplevel, "test", name)
client = os.path.join(testdir, "client")
print "starting client...",
-clientPipe = os.popen(client)
+clientPipe = os.popen(client + " 2>&1")
print "ok"
TestUtil.printOutputFromPipe(clientPipe);
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 22:39:12 +0000