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 /cs/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 'cs/config/TestUtil.py')
-rw-r--r-- | cs/config/TestUtil.py | 10 |
1 files changed, 5 insertions, 5 deletions
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) |