diff options
| author | Bernard Normier <bernard@zeroc.com> | 2004-05-04 21:23:00 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2004-05-04 21:23:00 +0000 |
| commit | 18016b667fbbdd2a82b62b89379973d41908dfa0 (patch) | |
| tree | 4ac240307745f97352ff093f4f4522b18bca3dac /cpp/config/TestUtil.py | |
| parent | Reverted back to plain popen to get error status (diff) | |
| download | ice-18016b667fbbdd2a82b62b89379973d41908dfa0.tar.bz2 ice-18016b667fbbdd2a82b62b89379973d41908dfa0.tar.xz ice-18016b667fbbdd2a82b62b89379973d41908dfa0.zip | |
Redirected stderr to stdout in all popen calls
Diffstat (limited to 'cpp/config/TestUtil.py')
| -rw-r--r-- | cpp/config/TestUtil.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py index 4d3bd807172..b6461c9fe2d 100644 --- a/cpp/config/TestUtil.py +++ b/cpp/config/TestUtil.py @@ -240,13 +240,13 @@ def clientServerTestWithOptionsAndNames(name, additionalServerOptions, additiona client = os.path.join(testdir, clientName) print "starting " + serverName + "...", - serverPipe = os.popen(server + serverOptions + additionalServerOptions) + serverPipe = os.popen(server + serverOptions + additionalServerOptions + " 2>&1") getServerPid(serverPipe) getAdapterReady(serverPipe) print "ok" print "starting " + clientName + "...", - clientPipe = os.popen(client + clientOptions + additionalClientOptions) + clientPipe = os.popen(client + clientOptions + additionalClientOptions + " 2>&1") print "ok" printOutputFromPipe(clientPipe) @@ -273,13 +273,13 @@ def mixedClientServerTestWithOptions(name, additionalServerOptions, additionalCl client = os.path.join(testdir, "client") print "starting server...", - serverPipe = os.popen(server + clientServerOptions + additionalServerOptions) + serverPipe = os.popen(server + clientServerOptions + additionalServerOptions + " 2>&1") getServerPid(serverPipe) getAdapterReady(serverPipe) print "ok" print "starting client...", - clientPipe = os.popen(client + clientServerOptions + additionalClientOptions) + clientPipe = os.popen(client + clientServerOptions + additionalClientOptions + " 2>&1") getServerPid(clientPipe) getAdapterReady(clientPipe) print "ok" @@ -303,7 +303,7 @@ def collocatedTestWithOptions(name, additionalOptions): collocated = os.path.join(testdir, "collocated") print "starting collocated...", - collocatedPipe = os.popen(collocated + collocatedOptions + additionalOptions) + collocatedPipe = os.popen(collocated + collocatedOptions + additionalOptions + " 2>&1") print "ok" printOutputFromPipe(collocatedPipe) |