summaryrefslogtreecommitdiff
path: root/cs/config/TestUtil.py
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2004-07-06 00:37:50 +0000
committerMichi Henning <michi@zeroc.com>2004-07-06 00:37:50 +0000
commit692e2c2ad6a75312b005332b714fdf015ca3a19c (patch)
tree55c7c45c8cb366e54fdc53afff3dc1a0b10d35f8 /cs/config/TestUtil.py
parentFixed fault tolerance tests. (diff)
downloadice-692e2c2ad6a75312b005332b714fdf015ca3a19c.tar.bz2
ice-692e2c2ad6a75312b005332b714fdf015ca3a19c.tar.xz
ice-692e2c2ad6a75312b005332b714fdf015ca3a19c.zip
Removed exit(1) call if killServers is used under Cygwin.
Diffstat (limited to 'cs/config/TestUtil.py')
-rw-r--r--cs/config/TestUtil.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/cs/config/TestUtil.py b/cs/config/TestUtil.py
index 9e99789bcd7..0bfe36540cd 100644
--- a/cs/config/TestUtil.py
+++ b/cs/config/TestUtil.py
@@ -61,11 +61,19 @@ def killServers():
global serverPids
+ 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)
+
for pid in serverPids:
- if isCygwin():
- print "killServers(): not implemented for cygwin python."
- #sys.exit(1)
- elif isWin32():
+ if isWin32():
try:
import win32api
handle = win32api.OpenProcess(1, 0, pid)