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/TestUtil.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/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 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) |