summaryrefslogtreecommitdiff
path: root/py/test/Ice/faultTolerance/run.py
diff options
context:
space:
mode:
Diffstat (limited to 'py/test/Ice/faultTolerance/run.py')
-rwxr-xr-xpy/test/Ice/faultTolerance/run.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/py/test/Ice/faultTolerance/run.py b/py/test/Ice/faultTolerance/run.py
index 44cf4fde9f3..b59bb43dae9 100755
--- a/py/test/Ice/faultTolerance/run.py
+++ b/py/test/Ice/faultTolerance/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
server = os.path.join(os.getcwd(), "Server.py")
client = os.path.join(os.getcwd(), "Client.py")
@@ -28,20 +28,20 @@ base = 12340
serverProc = []
for i in range(0, num):
- print "starting server #%d..." % (i + 1),
+ sys.stdout.write("starting server #%d... " % (i + 1))
sys.stdout.flush()
serverProc.append(TestUtil.startServer(server, "%d" % (base + i)))
- print "ok"
+ print("ok")
ports = ""
for i in range(0, num):
ports = "%s %d" % (ports, base + i)
-print "starting client...",
+sys.stdout.write("starting client... ")
+sys.stdout.flush()
clientProc = TestUtil.startClient(client, ports, startReader = False)
-print "ok"
+print("ok")
clientProc.startReader()
clientProc.waitTestSuccess()
for p in serverProc:
p.waitTestSuccess()
-