fixes

19 files changed, 20 insertions, 39 deletions

diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py
index 70177f30186..1ff97a9e9db 100755
--- a/cpp/test/Freeze/complex/run.py
+++ b/cpp/test/Freeze/complex/run.py
@@ -40,8 +40,7 @@ print "starting populate...",
 populatePipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " populate")
 print "ok"
 
-for output in populatePipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(populatePipe)
 
 populateStatus = populatePipe.close()
 
@@ -52,8 +51,7 @@ print "starting verification client...",
 clientPipe = os.popen(client + TestUtil.clientOptions + " --dbdir " + testdir + " validate")
 print "ok"
 
-for output in clientPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(clientPipe)
 
 clientStatus = clientPipe.close()
 
diff --git a/cpp/test/Freeze/cursor/run.py b/cpp/test/Freeze/cursor/run.py
index 0cf2e0bcf84..eb4c6067002 100755
--- a/cpp/test/Freeze/cursor/run.py
+++ b/cpp/test/Freeze/cursor/run.py
@@ -37,8 +37,7 @@ print "starting client...",
 clientPipe = os.popen(client + TestUtil.clientOptions + " " + testdir)
 print "ok"
 
-for output in clientPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(clientPipe)
 
 clientStatus = clientPipe.close()
 
diff --git a/cpp/test/Freeze/dbmap/run.py b/cpp/test/Freeze/dbmap/run.py
index 4c03bbe7730..11326f5e93d 100755
--- a/cpp/test/Freeze/dbmap/run.py
+++ b/cpp/test/Freeze/dbmap/run.py
@@ -37,8 +37,7 @@ print "starting client...",
 clientPipe = os.popen(client + TestUtil.clientOptions + " " + testdir)
 print "ok"
 
-for output in clientPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(clientPipe)
 
 clientStatus = clientPipe.close()
 
diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp
index 2e6328d9a2a..1a43fc7b24b 100644
--- a/cpp/test/Ice/faultTolerance/AllTests.cpp
+++ b/cpp/test/Ice/faultTolerance/AllTests.cpp
@@ -36,7 +36,7 @@ public:
 	IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
 	while(!_called)
 	{
-	    if(!timedWait(IceUtil::Time::seconds(5)))
+	    if(!timedWait(IceUtil::Time::seconds(30)))
 	    {
 		return false;
 	    }
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index f4b10257997..c8193be36c8 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -49,8 +49,7 @@ print "starting client...",
 clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports)
 print "ok"
 
-for output in clientPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(clientPipe)
 
 clientStatus = clientPipe.close()
 serverStatus = None
diff --git a/cpp/test/Ice/gc/run.py b/cpp/test/Ice/gc/run.py
index 946369582ab..c243315755e 100755
--- a/cpp/test/Ice/gc/run.py
+++ b/cpp/test/Ice/gc/run.py
@@ -34,8 +34,7 @@ print "starting client...",
 clientPipe = os.popen(client)
 print "ok"
 
-for output in clientPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(clientPipe)
     
 clientStatus = clientPipe.close()
 
diff --git a/cpp/test/IcePack/deployer/run.py b/cpp/test/IcePack/deployer/run.py
index 9329c80661f..cd8631e9fc1 100755
--- a/cpp/test/IcePack/deployer/run.py
+++ b/cpp/test/IcePack/deployer/run.py
@@ -48,8 +48,7 @@ def startClient(options):
     clientPipe = os.popen(os.path.join(testdir, "client") + fullClientOptions)
     print "ok"
 
-    for output in clientPipe.xreadlines():
-        print output,
+    TestUtil.printOutputFromPipe(clientPipe)
     
     clientStatus = clientPipe.close()
     if clientStatus:
diff --git a/cpp/test/IcePack/simple/run.py b/cpp/test/IcePack/simple/run.py
index e9e3aa9dc63..61d0583e8e9 100755
--- a/cpp/test/IcePack/simple/run.py
+++ b/cpp/test/IcePack/simple/run.py
@@ -75,8 +75,7 @@ print "starting client...",
 clientPipe = os.popen(client + TestUtil.clientOptions + additionalOptions + " --with-deploy")
 print "ok"
 
-for output in clientPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(clientPipe)
     
 clientStatus = clientPipe.close()
 if clientStatus:
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/run.py b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
index c45afcf6d9f..d0aaced503b 100755
--- a/cpp/test/IceSSL/certificateAndKeyParsing/run.py
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
@@ -45,8 +45,7 @@ print "starting certificateAndKeyParsing...",
 clientPipe = os.popen(client + localClientOptions + testOptions)
 print "ok"
 
-for output in clientPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(clientPipe)
     
 clientStatus = clientPipe.close()
 
diff --git a/cpp/test/IceSSL/certificateVerifier/run.py b/cpp/test/IceSSL/certificateVerifier/run.py
index c636d9531d1..af63abb3e9e 100755
--- a/cpp/test/IceSSL/certificateVerifier/run.py
+++ b/cpp/test/IceSSL/certificateVerifier/run.py
@@ -39,8 +39,7 @@ print "starting certificateVerifier...",
 clientPipe = os.popen(client + localClientOptions)
 print "ok"
 
-for output in clientPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(clientPipe)
     
 clientStatus = clientPipe.close()
 
diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py
index db98b98dc63..39b8edd3b6e 100755
--- a/cpp/test/IceSSL/configuration/run.py
+++ b/cpp/test/IceSSL/configuration/run.py
@@ -39,8 +39,7 @@ print "starting configuration...",
 clientPipe = os.popen(client + localClientOptions)
 print "ok"
 
-for output in clientPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(clientPipe)
     
 clientStatus = clientPipe.close()
 
diff --git a/cpp/test/IceSSL/loadPEM/run.py b/cpp/test/IceSSL/loadPEM/run.py
index 67489135b55..eb7517bb2f6 100755
--- a/cpp/test/IceSSL/loadPEM/run.py
+++ b/cpp/test/IceSSL/loadPEM/run.py
@@ -44,8 +44,7 @@ print "starting loadPEM...",
 clientPipe = os.popen(client + localClientOptions + testOptions)
 print "ok"
 
-for output in clientPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(clientPipe)
     
 clientStatus = clientPipe.close()
 
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index 75b2b717e43..4e5ebdaa498 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -91,8 +91,7 @@ def doTest(batch):
     publisherPipe = os.popen(command)
     print "ok"
 
-    for output in publisherPipe.xreadlines():
-        print output,
+    TestUtil.printOutputFromPipe(publisherPipe)
 
     #
     # Verify that the subscriber has terminated.
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index df398d44dd1..34690ee476f 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -93,8 +93,7 @@ def doTest(batch):
     publisherPipe = os.popen(command)
     print "ok"
 
-    for output in publisherPipe.xreadlines():
-        print output,
+    TestUtil.printOutputFromPipe(publisherPipe)
 
     #
     # Verify that the subscriber has terminated.
diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py
index 35d52771d9c..d6bffe5f71e 100755
--- a/cpp/test/IceStorm/single/run.py
+++ b/cpp/test/IceStorm/single/run.py
@@ -97,8 +97,7 @@ command = publisher + TestUtil.clientOptions + iceStormReference
 publisherPipe = os.popen(command)
 print "ok"
 
-for output in publisherPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(publisherPipe);
     
 #
 # Verify that the subscriber has terminated.
diff --git a/cpp/test/IceUtil/inputUtil/run.py b/cpp/test/IceUtil/inputUtil/run.py
index 338fae74000..1fc265bffe1 100755
--- a/cpp/test/IceUtil/inputUtil/run.py
+++ b/cpp/test/IceUtil/inputUtil/run.py
@@ -35,8 +35,7 @@ print "starting client...",
 clientPipe = os.popen(client + clientOptions)
 print "ok"
 
-for output in clientPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(clientPipe);
     
 clientStatus = clientPipe.close()
 
diff --git a/cpp/test/IceUtil/thread/run.py b/cpp/test/IceUtil/thread/run.py
index 3052bcc7f74..0ea120b1c54 100755
--- a/cpp/test/IceUtil/thread/run.py
+++ b/cpp/test/IceUtil/thread/run.py
@@ -35,8 +35,7 @@ print "starting client...",
 clientPipe = os.popen(client + clientOptions)
 print "ok"
 
-for output in clientPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(clientPipe);
     
 clientStatus = clientPipe.close()
 
diff --git a/cpp/test/IceUtil/unicode/run.py b/cpp/test/IceUtil/unicode/run.py
index 5c1ffde90be..6081f6235ee 100755
--- a/cpp/test/IceUtil/unicode/run.py
+++ b/cpp/test/IceUtil/unicode/run.py
@@ -49,8 +49,7 @@ print "starting client...",
 clientPipe = os.popen(client + clientOptions)
 print "ok"
 
-for output in clientPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(clientPipe);
     
 os.remove("numeric.txt")
 os.remove("utf8.txt")
diff --git a/cpp/test/IceUtil/uuid/run.py b/cpp/test/IceUtil/uuid/run.py
index 35af18aaf04..2fa3a69594c 100755
--- a/cpp/test/IceUtil/uuid/run.py
+++ b/cpp/test/IceUtil/uuid/run.py
@@ -34,8 +34,7 @@ print "starting client...",
 clientPipe = os.popen(client)
 print "ok"
 
-for output in clientPipe.xreadlines():
-    print output,
+TestUtil.printOutputFromPipe(clientPipe);
     
 clientStatus = clientPipe.close()