summaryrefslogtreecommitdiff
path: root/cpp/demo/IceUtil/workqueue/expect.py
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/demo/IceUtil/workqueue/expect.py')
-rwxr-xr-xcpp/demo/IceUtil/workqueue/expect.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/demo/IceUtil/workqueue/expect.py b/cpp/demo/IceUtil/workqueue/expect.py
index a5d7d080eed..04477abe53a 100755
--- a/cpp/demo/IceUtil/workqueue/expect.py
+++ b/cpp/demo/IceUtil/workqueue/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,15 +16,15 @@ 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
server = Util.spawn('./workqueue')
server.expect('Pushing work items')
-print "testing...",
+sys.stdout.write("testing... ")
sys.stdout.flush()
server.expect('work item: item1')
server.expect('work item: item2')
@@ -32,4 +32,4 @@ server.expect('work item: item3')
server.expect('work item: item4')
server.expect('work item: item5')
server.waitTestSuccess(timeout=10)
-print "ok"
+print("ok")