summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid/fileLock/run.py
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/IceGrid/fileLock/run.py')
-rwxr-xr-xcpp/test/IceGrid/fileLock/run.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/cpp/test/IceGrid/fileLock/run.py b/cpp/test/IceGrid/fileLock/run.py
index 8068eb87cff..41f6b82ee41 100755
--- a/cpp/test/IceGrid/fileLock/run.py
+++ b/cpp/test/IceGrid/fileLock/run.py
@@ -16,9 +16,9 @@ if len(head) > 0:
path = [os.path.join(head, p) for p in path]
path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
if len(path) == 0:
- raise "can't find toplevel directory!"
-sys.path.append(os.path.join(path[0]))
-from scripts import *
+ raise RuntimeError("can't find toplevel directory!")
+sys.path.append(os.path.join(path[0], "scripts"))
+import TestUtil, IceGridAdmin
testdir = os.getcwd();
@@ -52,11 +52,10 @@ def runIceGridRegistry():
registryProcs = IceGridAdmin.startIceGridRegistry(testdir)
-print "testing IceGrid file lock...",
+sys.stdout.write("testing IceGrid file lock... ")
iceGrid = runIceGridRegistry()
iceGrid.expect(".*IceUtil::FileLockedException.*")
iceGrid.wait()
-print "ok"
+print("ok")
IceGridAdmin.shutdownIceGridRegistry(registryProcs)
-