summaryrefslogtreecommitdiff
path: root/py/demo/Ice/minimal/expect.py
diff options
context:
space:
mode:
Diffstat (limited to 'py/demo/Ice/minimal/expect.py')
-rwxr-xr-xpy/demo/Ice/minimal/expect.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/py/demo/Ice/minimal/expect.py b/py/demo/Ice/minimal/expect.py
index e0369ef3d23..63de5d4a87c 100755
--- a/py/demo/Ice/minimal/expect.py
+++ b/py/demo/Ice/minimal/expect.py
@@ -8,7 +8,7 @@
#
# **********************************************************************
-import sys, os
+import sys, os, signal
path = [ ".", "..", "../..", "../../..", "../../../.." ]
head = os.path.dirname(sys.argv[0])
@@ -16,21 +16,20 @@ 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('Server.py --Ice.PrintAdapterReady')
server.expect('.* ready')
-print "testing...",
+sys.stdout.write("testing... ")
sys.stdout.flush()
client = Util.spawn('Client.py')
client.waitTestSuccess()
server.expect('Hello World!')
-print "ok"
+print("ok")
-import signal
server.kill(signal.SIGTERM)
server.waitTestSuccess(-signal.SIGTERM)