diff options
Diffstat (limited to 'cpp/test/Glacier2/attack/run.py')
| -rwxr-xr-x | cpp/test/Glacier2/attack/run.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/test/Glacier2/attack/run.py b/cpp/test/Glacier2/attack/run.py index 624dc1f7e5c..8b510507d5f 100755 --- a/cpp/test/Glacier2/attack/run.py +++ b/cpp/test/Glacier2/attack/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.getcwd() router = TestUtil.getGlacier2Router() @@ -32,9 +32,10 @@ args = ' --Glacier2.RoutingTable.MaxSize=10' + \ ' --Ice.Admin.InstanceName=Glacier2' + \ ' --Glacier2.CryptPasswords="' + os.path.join(testdir, "passwords") + '"' -print "starting router...", +sys.stdout.write("starting router... ") +sys.stdout.flush() starterProc = TestUtil.startServer(router, args, count=2) -print "ok" +print("ok") TestUtil.clientServerTest() |