summaryrefslogtreecommitdiff
path: root/cpp/test/Glacier2/sessionHelper/run.py
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/Glacier2/sessionHelper/run.py')
-rwxr-xr-xcpp/test/Glacier2/sessionHelper/run.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/cpp/test/Glacier2/sessionHelper/run.py b/cpp/test/Glacier2/sessionHelper/run.py
index 1705881b750..7284609bbda 100755
--- a/cpp/test/Glacier2/sessionHelper/run.py
+++ b/cpp/test/Glacier2/sessionHelper/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
router = os.path.join(TestUtil.getCppBinDir(), "glacier2router")
@@ -31,15 +31,13 @@ args = ' --Ice.Warn.Dispatch=0' + \
' --Ice.Admin.InstanceName=Glacier2' + \
' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"'
-print "starting router...",
+sys.stdout.write("starting router... ")
+sys.stdout.flush()
routerConfig = TestUtil.DriverConfig("server")
routerConfig.lang = "cpp"
starterProc = TestUtil.startServer(router, args, count=2, config=routerConfig)
-print "ok"
-
-
+print("ok")
TestUtil.clientServerTest(additionalClientOptions=" --shutdown")
starterProc.waitTestSuccess()
-