summaryrefslogtreecommitdiff
path: root/cpp/demo/Freeze/library/expect.py
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/demo/Freeze/library/expect.py')
-rwxr-xr-xcpp/demo/Freeze/library/expect.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/demo/Freeze/library/expect.py b/cpp/demo/Freeze/library/expect.py
index 3ace50b52cd..2c1fce8a657 100755
--- a/cpp/demo/Freeze/library/expect.py
+++ b/cpp/demo/Freeze/library/expect.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
@@ -16,16 +16,16 @@ 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
from demoscript.Freeze import library
-print "cleaning databases...",
+sys.stdout.write("cleaning databases... ")
sys.stdout.flush()
Util.cleanDbDir("db")
-print "ok"
+print("ok")
server = Util.spawn('./server --Ice.PrintAdapterReady --Freeze.Trace.Evictor=0 --Freeze.Trace.DbEnv=0')
server.expect('.* ready')
@@ -34,12 +34,12 @@ client.expect('>')
library.run(client, server)
-print "running with collocated server"
+print("running with collocated server")
-print "cleaning databases...",
+sys.stdout.write("cleaning databases... ")
sys.stdout.flush()
Util.cleanDbDir("db")
-print "ok"
+print("ok")
server = Util.spawn('./collocated --Freeze.Trace.Evictor=0 --Freeze.Trace.DbEnv=0')
server.expect('>>> ')