diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2006-06-14 15:36:59 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2006-06-14 15:36:59 +0000 |
| commit | 7c5eb075963fdf4f7e91abe8ae3ffd93c5d2f13a (patch) | |
| tree | 6821ce50c5cd24cf27444a5190074d295dc77c7c /cs/config/TestUtil.py | |
| parent | Bug 923 - read config as UTF8 and convert using string converter (diff) | |
| download | ice-7c5eb075963fdf4f7e91abe8ae3ffd93c5d2f13a.tar.bz2 ice-7c5eb075963fdf4f7e91abe8ae3ffd93c5d2f13a.tar.xz ice-7c5eb075963fdf4f7e91abe8ae3ffd93c5d2f13a.zip | |
minor code harness changes.
Diffstat (limited to 'cs/config/TestUtil.py')
| -rw-r--r-- | cs/config/TestUtil.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/cs/config/TestUtil.py b/cs/config/TestUtil.py index 02b0b30cf34..14439928697 100644 --- a/cs/config/TestUtil.py +++ b/cs/config/TestUtil.py @@ -8,9 +8,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. @@ -43,6 +40,8 @@ debug = 0 # # Don't change anything below this line! # +import sys, os, re, errno, getopt +from threading import Thread def isCygwin(): @@ -218,12 +217,15 @@ def getServerPid(pipe): def ignorePid(pipe): - output = pipe.readline().strip() - - if not output: - print "failed!" - killServers() - sys.exit(1) + while 1: + output = pipe.readline().strip() + if not output: + print "failed!" + killServers() + sys.exit(1) + if output.startswith("warning: "): + continue + break def getAdapterReady(pipe, createThread = True): global serverThreads |