summaryrefslogtreecommitdiff
path: root/cpp/demo/Freeze/customEvictor/expect.py
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/demo/Freeze/customEvictor/expect.py')
-rwxr-xr-xcpp/demo/Freeze/customEvictor/expect.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/cpp/demo/Freeze/customEvictor/expect.py b/cpp/demo/Freeze/customEvictor/expect.py
index 45ecac4f2e7..b0685606d0a 100755
--- a/cpp/demo/Freeze/customEvictor/expect.py
+++ b/cpp/demo/Freeze/customEvictor/expect.py
@@ -16,38 +16,38 @@ 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, "demoscript")) ]
if len(path) == 0:
- raise "can't find toplevel directory!"
+ raise RuntimeError("can't find toplevel directory!")
sys.path.append(path[0])
-from demoscript import *
+from demoscript import Util
if Util.isDarwin():
- print "This demo is not supported under MacOS."
+ print("This demo is not supported under MacOS.")
sys.exit(0)
-print "cleaning databases...",
+sys.stdout.write("cleaning databases... ")
sys.stdout.flush()
Util.cleanDbDir("db")
-print "ok"
+print("ok")
-print "testing IceUtil::Cache evictor"
+print("testing IceUtil::Cache evictor")
server = Util.spawn('./server --Ice.PrintAdapterReady')
server.expect(".* ready", timeout=120)
client = Util.spawn('./client')
client.waitTestSuccess(timeout=8 * 60)
-print client.before
+print(client.before)
server.kill(signal.SIGINT)
server.waitTestSuccess(timeout=60)
-print "testing simple evictor"
+print("testing simple evictor")
server = Util.spawn('./server simple --Ice.PrintAdapterReady')
server.expect(".* ready")
client = Util.spawn('./client')
client.waitTestSuccess(timeout=8*60)
-print client.before
+print(client.before)
server.kill(signal.SIGINT)
server.waitTestSuccess(timeout=60)