fix

4 files changed, 16 insertions, 12 deletions

diff --git a/cpp/test/IceSSL/certificateVerification/Client.cpp b/cpp/test/IceSSL/certificateVerification/Client.cpp
index cd5e2708f76..5cfc538380f 100644
--- a/cpp/test/IceSSL/certificateVerification/Client.cpp
+++ b/cpp/test/IceSSL/certificateVerification/Client.cpp
@@ -104,8 +104,9 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     {
 	cout << "ok" << endl;
     }
-    catch(const Ice::LocalException&)
+    catch(const Ice::LocalException& ex)
     {
+	cout << ex << endl;
         km->shutdown();
         test(false);
     }
@@ -125,8 +126,9 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     {
 	cout << "ok" << endl;
     }
-    catch(const Ice::LocalException&)
+    catch(const Ice::LocalException& ex)
     {
+	cout << ex << endl;
         km->shutdown();
         test(false);
     }
@@ -155,8 +157,9 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
         //       generating this exception.
 	cout << "ok" << endl;
     }
-    catch(const Ice::LocalException&)
+    catch(const Ice::LocalException& ex)
     {
+	cout << ex << endl;
         km->shutdown();
         test(false);
     }
@@ -172,8 +175,9 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 	pinger5->ping();
 	cout << "ok" << endl;
     }
-    catch(const Ice::LocalException&)
+    catch(const Ice::LocalException& ex)
     {
+	cout << ex << endl;
         km->shutdown();
         test(false);
     }
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index 37efd293f8d..120710da820 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -14,7 +14,7 @@
 # **********************************************************************
 
 import os, sys
-from time import sleep
+import time
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
@@ -79,7 +79,7 @@ def doTest(batch):
             print "failed!"
             TestUtil.killServers()
             sys.exit(1)
-        sleep(1)
+        time.sleep(1)
         lockCount = lockCount + 1    
     print "ok"
 
@@ -104,7 +104,7 @@ def doTest(batch):
             print "failed!"
             TestUtil.killServers()
             sys.exit(1)
-        sleep(1)
+        time.sleep(1)
         lockCount = lockCount + 1    
     print "ok"
 
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index 454c49d3dfa..0d8f087476b 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -14,7 +14,7 @@
 # **********************************************************************
 
 import os, sys
-from time import sleep
+import time
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
@@ -81,7 +81,7 @@ def doTest(batch):
             print "failed!"
             TestUtil.killServers()
             sys.exit(1)
-        sleep(1)
+        time.sleep(1)
         lockCount = lockCount + 1    
     print "ok"
 
@@ -106,7 +106,7 @@ def doTest(batch):
             print "failed!"
             TestUtil.killServers()
             sys.exit(1)
-        sleep(1)
+        time.sleep(1)
         lockCount = lockCount + 1    
     print "ok"
 
diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py
index 98e81997c7f..3a39ce4415a 100755
--- a/cpp/test/IceStorm/single/run.py
+++ b/cpp/test/IceStorm/single/run.py
@@ -14,7 +14,7 @@
 # **********************************************************************
 
 import os, sys
-from time import sleep
+import time
 
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.normpath(toplevel)
@@ -110,7 +110,7 @@ while os.path.isfile(subscriberLockFile):
         print "failed!"
         TestUtil.killServers()
         sys.exit(1)
-    sleep(1)
+    time.sleep(1)
     lockCount = lockCount + 1    
 print "ok"