diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2006-06-14 15:06:09 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2006-06-14 15:06:09 +0000 |
| commit | 669b34fd3078ed93990c3679545dbadef4d52808 (patch) | |
| tree | f98e42d734551be60a4c028616db0f7163dabf30 /cpp | |
| parent | added support for --compress, --host, --threadPerConnection, --protocol. (diff) | |
| download | ice-669b34fd3078ed93990c3679545dbadef4d52808.tar.bz2 ice-669b34fd3078ed93990c3679545dbadef4d52808.tar.xz ice-669b34fd3078ed93990c3679545dbadef4d52808.zip | |
minor changes to test harness
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/TestUtil.py | 8 | ||||
| -rwxr-xr-x | cpp/test/Ice/faultTolerance/run.py | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py index dd6062f7af8..5d538f3343d 100644 --- a/cpp/config/TestUtil.py +++ b/cpp/config/TestUtil.py @@ -9,9 +9,6 @@ # # ********************************************************************** -import sys, os, re, errno, getopt -from threading import Thread - # # Set protocol to "ssl" in case you want to run the tests with the SSL # protocol. Otherwise TCP is used. @@ -51,6 +48,9 @@ debug = 0 # # Don't change anything below this line! # +import sys, os, re, errno, getopt +from threading import Thread + def usage(): print "usage: " + sys.argv[0] + " --debug --protocol protocol --compress --host host --threadPerConnection" sys.exit(2) @@ -466,8 +466,6 @@ def mixedClientServerTestWithOptions(name, additionalServerOptions, additionalCl if clientStatus: killServers() - joinServers() - if clientStatus or serverStatus(): sys.exit(1) diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py index 786697fcc2b..c192a537ef9 100755 --- a/cpp/test/Ice/faultTolerance/run.py +++ b/cpp/test/Ice/faultTolerance/run.py @@ -29,7 +29,6 @@ client = os.path.join(testdir, "client") num = 12 base = 12340 -serverThreads = { } for i in range(0, num): print "starting server #%d..." % (i + 1), serverPipe = os.popen(server + TestUtil.serverOptions + " %d" % (base + i) + " 2>&1") |