summaryrefslogtreecommitdiff
path: root/java/config/TestUtil.py
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2004-11-08 17:40:45 +0000
committerMarc Laukien <marc@zeroc.com>2004-11-08 17:40:45 +0000
commit7f84627dbe416001bc88b4f2a380c0f1b66eccc8 (patch)
tree8631165aa89c71caa5a9103a8ac32e73d22b5fe9 /java/config/TestUtil.py
parentmake depend (diff)
downloadice-7f84627dbe416001bc88b4f2a380c0f1b66eccc8.tar.bz2
ice-7f84627dbe416001bc88b4f2a380c0f1b66eccc8.tar.xz
ice-7f84627dbe416001bc88b4f2a380c0f1b66eccc8.zip
glacier2 shutdown test
Diffstat (limited to 'java/config/TestUtil.py')
-rw-r--r--java/config/TestUtil.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py
index 89f018fd21c..ba7c12ad2f8 100644
--- a/java/config/TestUtil.py
+++ b/java/config/TestUtil.py
@@ -56,14 +56,7 @@ def killServers():
if isCygwin():
print "killServers(): not implemented for cygwin python."
-
- #
- # TODO: Michi: Not sure why exit(1) was here. This means that, when
- # we run the test suite with allTests.py under Cygwin, the first sub-test that
- # calls killServers will return non-zero exit status and, therefore,
- # terminate allTests.py, so the subsequence tests are never run.
- #
- #sys.exit(1)
+ return;
for pid in serverPids:
if isWin32():
@@ -176,7 +169,6 @@ def clientServerTestWithOptions(additionalServerOptions, additionalClientOptions
clientPipe = os.popen(client + clientOptions + additionalClientOptions + " 2>&1")
print "ok"
- #printOutputFromPipe(serverPipe)
printOutputFromPipe(clientPipe)
clientStatus = clientPipe.close()