1 files changed, 12 insertions, 11 deletions
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index 62b48b15fa6..bf0d91e32b5 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -17,9 +17,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, IceStormUtil
 
 publisher = os.path.join(os.getcwd(), "publisher")
 subscriber = os.path.join(os.getcwd(), "subscriber")
@@ -53,33 +53,34 @@ def runtest(type, **args):
 
     icestorm.start()
 
-    print "setting up topics...",
+    sys.stdout.write("setting up topics... ")
     sys.stdout.flush()
     icestorm.admin("create fed1 fed2 fed3; link fed1 fed2 10; link fed2 fed3 5")
-    print "ok"
+    print("ok")
 
     #
     # Test oneway subscribers.
     #
-    print "testing oneway subscribers...",
+    sys.stdout.write("testing oneway subscribers... ")
     sys.stdout.flush()
     doTest(icestorm, 0)
-    print "ok"
+    print("ok")
 
     #
     # Test batch oneway subscribers.
     #
-    print "testing batch subscribers...",
+    sys.stdout.write("testing batch subscribers... ")
     sys.stdout.flush()
     doTest(icestorm, 1)
-    print "ok"
+    print("ok")
 
     #
     # Destroy the topics.
     #
-    print "destroying topics...",
+    sys.stdout.write("destroying topics... ")
+    sys.stdout.flush()
     icestorm.admin("destroy fed1 fed2 fed3")
-    print "ok"
+    print("ok")
 
     #
     # Shutdown icestorm.