summaryrefslogtreecommitdiff
path: root/java/test/Freeze/complex/run.py
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2012-04-24 14:16:15 -0700
committerMark Spruiell <mes@zeroc.com>2012-04-24 14:16:15 -0700
commit943a48fc5c0a59b892eb746073c71b8dd88815e7 (patch)
tree421cfedbc60603d02e0b314d9204e9f85dd781c5 /java/test/Freeze/complex/run.py
parentminor fix to IcePHP getLogger (diff)
downloadice-943a48fc5c0a59b892eb746073c71b8dd88815e7.tar.bz2
ice-943a48fc5c0a59b892eb746073c71b8dd88815e7.tar.xz
ice-943a48fc5c0a59b892eb746073c71b8dd88815e7.zip
python 3 support
Diffstat (limited to 'java/test/Freeze/complex/run.py')
-rwxr-xr-xjava/test/Freeze/complex/run.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/java/test/Freeze/complex/run.py b/java/test/Freeze/complex/run.py
index 672da20e992..d06d6dbc98b 100755
--- a/java/test/Freeze/complex/run.py
+++ b/java/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
#
# Clean the contents of the database directory.
@@ -26,17 +26,19 @@ from scripts import *
dbdir = os.path.join(os.getcwd(), "db")
TestUtil.cleanDbDir(dbdir)
-print "starting populate...",
+sys.stdout.write("starting populate... ")
+sys.stdout.flush()
populateProc = TestUtil.startClient("test.Freeze.complex.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("test.Freeze.complex.Client", ' --dbdir "%s" validate' % os.getcwd(), startReader=False)
-print "ok"
+print("ok")
clientProc.startReader()
clientProc.waitTestSuccess()