1 files changed, 24 insertions, 8 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 6d7f3adf14a..6c473b14f06 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -11,6 +11,8 @@
 
 import sys, os
 
+serverOptions = " --Ice.PrintProcessId --Ice.PrintAdapterReady --Ice.ServerIdleTime=60"
+
 serverPids = []
 
 def killServers():
@@ -27,23 +29,37 @@ def killServers():
 
     serverPids = []
 
-def clientServerTest(toplevel, name):
-
-    testdir = os.path.normpath(toplevel + "/test/" + name)
-    server = os.path.normpath(testdir + "/server")
-    client = os.path.normpath(testdir + "/client")
+def getServerPid(serverPipe):
 
-    print "starting server...",
-    serverPipe = os.popen(server + " --Ice.PrintProcessId --Ice.PrintAdapterReady")
     output = serverPipe.readline().strip()
+
     if not output:
         print "failed!"
+        killServers()
         sys.exit(0)
+
     serverPids.append(int(output))
+
+def getAdapterReady(serverPipe):
+
     output = serverPipe.readline().strip()
+
     if not output:
         print "failed!"
+        killServers()
         sys.exit(0)
+    
+
+def clientServerTest(toplevel, name):
+
+    testdir = os.path.normpath(toplevel + "/test/" + name)
+    server = os.path.normpath(testdir + "/server")
+    client = os.path.normpath(testdir + "/client")
+
+    print "starting server...",
+    serverPipe = os.popen(server + serverOptions)
+    getServerPid(serverPipe)
+    getAdapterReady(serverPipe)
     print "ok"
     
     print "starting client...",
@@ -51,7 +67,7 @@ def clientServerTest(toplevel, name):
     output = clientPipe.readline()
     if not output:
 	print "failed!"
-	TestUtil.killServers()
+	killServers()
 	sys.exit(0)
     print "ok"
     print output,