1 files changed, 6 insertions, 7 deletions
diff --git a/cpp/demo/Ice/minimal/expect.py b/cpp/demo/Ice/minimal/expect.py
index fe15c20274d..18f5823a845 100755
--- a/cpp/demo/Ice/minimal/expect.py
+++ b/cpp/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 --Ice.PrintAdapterReady')
 server.expect('.* ready')
 
-print "testing...",
+sys.stdout.write("testing... ")
 sys.stdout.flush()
 client = Util.spawn('./client')
 client.waitTestSuccess()
 server.expect('Hello World!')
-print "ok"
+print("ok")
 
-import signal
 server.kill(signal.SIGINT)
-#server.waitTestSuccess()
+server.waitTestFail()