diff options
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/allTests.py | 7 | ||||
| -rw-r--r-- | cpp/test/IceSSL/certificateVerification/Client.cpp | 12 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/federation/run.py | 6 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/federation2/run.py | 6 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/single/run.py | 4 |
5 files changed, 23 insertions, 12 deletions
diff --git a/cpp/allTests.py b/cpp/allTests.py index 7ec6eb2814e..f9c9e862699 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -16,6 +16,13 @@ import os, sys import getopt +# +# I must import "time" here, otherwise I get a "NameError: global name +# 'time' is not defined" in the IceStorm run.py scripts. I have no +# idea why. +# +import time + for toplevel in [".", "..", "../..", "../../..", "../../../.."]: toplevel = os.path.normpath(toplevel) if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): 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" |