diff options
| author | Michi Henning <michi@zeroc.com> | 2004-07-06 00:42:58 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2004-07-06 00:42:58 +0000 |
| commit | 73fa5e352a21f34f2e9ddda56565553e31b4c694 (patch) | |
| tree | 60fde05e6b6569b16b0aa207d97ae3de6b7fb971 /java/config/TestUtil.py | |
| parent | Removed exit(1) call if killServers is used under Cygwin. (diff) | |
| download | ice-73fa5e352a21f34f2e9ddda56565553e31b4c694.tar.bz2 ice-73fa5e352a21f34f2e9ddda56565553e31b4c694.tar.xz ice-73fa5e352a21f34f2e9ddda56565553e31b4c694.zip | |
Removed exit(1) for killServers under Cygwin.
Diffstat (limited to 'java/config/TestUtil.py')
| -rw-r--r-- | java/config/TestUtil.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py index 652b2ebdcf3..9d9f686310e 100644 --- a/java/config/TestUtil.py +++ b/java/config/TestUtil.py @@ -55,11 +55,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) |