summaryrefslogtreecommitdiff
path: root/cpp/test/Freeze/complex/run.py
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/Freeze/complex/run.py')
-rwxr-xr-xcpp/test/Freeze/complex/run.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py
index deae63146e1..86316dce547 100755
--- a/cpp/test/Freeze/complex/run.py
+++ b/cpp/test/Freeze/complex/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
testdir = os.path.dirname(os.path.abspath(__file__))
@@ -33,15 +33,17 @@ client = os.path.join(os.getcwd(), "client")
if TestUtil.appverifier:
TestUtil.setAppVerifierSettings([client])
-print "starting populate...",
+sys.stdout.write("starting populate... ")
+sys.stdout.flush()
populateProc = TestUtil.startClient(client, ' --dbdir "%s" populate' % os.getcwd(), startReader = False)
-print "ok"
+print("ok")
populateProc.startReader()
populateProc.waitTestSuccess()
-print "starting verification client...",
+sys.stdout.write("starting verification client... ")
+sys.stdout.flush()
clientProc = TestUtil.startClient(client, ' --dbdir "%s" validate' % os.getcwd(), startReader = False)
-print "ok"
+print("ok")
clientProc.startReader()
clientProc.waitTestSuccess()