diff options
Diffstat (limited to 'java/demo')
29 files changed, 87 insertions, 91 deletions
diff --git a/java/demo/Freeze/bench/expect.py b/java/demo/Freeze/bench/expect.py index af460028ecd..a1ab4eddd16 100755 --- a/java/demo/Freeze/bench/expect.py +++ b/java/demo/Freeze/bench/expect.py @@ -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 bench -print "cleaning databases...", +sys.stdout.write("cleaning databases... ") sys.stdout.flush() Util.cleanDbDir("db") -print "ok" +print("ok") client = Util.spawn('java Client') bench.run(client, True) diff --git a/java/demo/Freeze/casino/expect.py b/java/demo/Freeze/casino/expect.py index 5d8c0264931..ad65259c972 100755 --- a/java/demo/Freeze/casino/expect.py +++ b/java/demo/Freeze/casino/expect.py @@ -16,10 +16,10 @@ 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 casino casino.run('java Client', 'java Server') diff --git a/java/demo/Freeze/library/expect.py b/java/demo/Freeze/library/expect.py index 57d07e821b0..fe616da7bcd 100755 --- a/java/demo/Freeze/library/expect.py +++ b/java/demo/Freeze/library/expect.py @@ -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('java 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('java Collocated --Freeze.Trace.Evictor=0 --Freeze.Trace.DbEnv=0') server.expect('>>> ') diff --git a/java/demo/Freeze/phonebook/expect.py b/java/demo/Freeze/phonebook/expect.py index c46b4cbc722..59bf8a58404 100755 --- a/java/demo/Freeze/phonebook/expect.py +++ b/java/demo/Freeze/phonebook/expect.py @@ -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 phonebook -print "cleaning databases...", +sys.stdout.write("cleaning databases... ") sys.stdout.flush() Util.cleanDbDir("db") -print "ok" +print("ok") server = Util.spawn('java Server --Ice.PrintAdapterReady --Freeze.Trace.Evictor=0 --Freeze.Trace.DbEnv=0') server.expect('.* ready') @@ -34,12 +34,12 @@ client.expect('>>> ') phonebook.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('java Collocated --Freeze.Trace.Evictor=0 --Freeze.Trace.DbEnv=0') server.expect('>>> ') diff --git a/java/demo/Freeze/transform/expect.py b/java/demo/Freeze/transform/expect.py index 14d725b68a1..939c7746303 100755 --- a/java/demo/Freeze/transform/expect.py +++ b/java/demo/Freeze/transform/expect.py @@ -16,10 +16,10 @@ 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 transform transform.run('java Create', 'java Recreate', 'java Read', 'java ReadNew') diff --git a/java/demo/Glacier2/callback/expect.py b/java/demo/Glacier2/callback/expect.py index 382fc8ec31f..2d68bec8e59 100755 --- a/java/demo/Glacier2/callback/expect.py +++ b/java/demo/Glacier2/callback/expect.py @@ -16,10 +16,10 @@ 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.Glacier2 import callback server = Util.spawn('java Server --Ice.PrintAdapterReady') diff --git a/java/demo/Ice/async/expect.py b/java/demo/Ice/async/expect.py index baa0ae25a0c..c5e4cf3357f 100755 --- a/java/demo/Ice/async/expect.py +++ b/java/demo/Ice/async/expect.py @@ -16,10 +16,10 @@ 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.Ice import async server = Util.spawn('java Server --Ice.PrintAdapterReady') diff --git a/java/demo/Ice/bidir/expect.py b/java/demo/Ice/bidir/expect.py index 16d8b8e9590..f5731570c69 100755 --- a/java/demo/Ice/bidir/expect.py +++ b/java/demo/Ice/bidir/expect.py @@ -16,10 +16,10 @@ 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.Ice import bidir server = Util.spawn('java Server --Ice.PrintAdapterReady') diff --git a/java/demo/Ice/callback/expect.py b/java/demo/Ice/callback/expect.py index 9ec3eb9aadf..a6d649e99b2 100755 --- a/java/demo/Ice/callback/expect.py +++ b/java/demo/Ice/callback/expect.py @@ -16,10 +16,10 @@ 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.Ice import callback server = Util.spawn('java Server --Ice.PrintAdapterReady') diff --git a/java/demo/Ice/hello/expect.py b/java/demo/Ice/hello/expect.py index 9530e557b43..739538c7aeb 100755 --- a/java/demo/Ice/hello/expect.py +++ b/java/demo/Ice/hello/expect.py @@ -16,10 +16,10 @@ 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.Ice import hello server = Util.spawn('java Server --Ice.PrintAdapterReady --Ice.Warn.Connections=0') diff --git a/java/demo/Ice/invoke/expect.py b/java/demo/Ice/invoke/expect.py index e589427f420..18b75b32a0f 100755 --- a/java/demo/Ice/invoke/expect.py +++ b/java/demo/Ice/invoke/expect.py @@ -16,10 +16,10 @@ 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.Ice import invoke server = Util.spawn('java Server --Ice.PrintAdapterReady') diff --git a/java/demo/Ice/latency/expect.py b/java/demo/Ice/latency/expect.py index 95d316a5028..27e6a47e11d 100755 --- a/java/demo/Ice/latency/expect.py +++ b/java/demo/Ice/latency/expect.py @@ -8,7 +8,7 @@ # # ********************************************************************** -import sys, os +import sys, os, signal path = [ ".", "..", "../..", "../../..", "../../../.." ] head = os.path.dirname(sys.argv[0]) @@ -16,22 +16,21 @@ 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('java Server --Ice.PrintAdapterReady') server.expect('.* ready') -print "testing ping... ", +sys.stdout.write("testing ping... ") sys.stdout.flush() client = Util.spawn('java Client') client.waitTestSuccess(timeout=100) -print "ok" +print("ok") -import signal server.kill(signal.SIGINT) server.waitTestSuccess() -print client.before +print(client.before) diff --git a/java/demo/Ice/minimal/expect.py b/java/demo/Ice/minimal/expect.py index 2b4ed140c3f..87516d98575 100755 --- a/java/demo/Ice/minimal/expect.py +++ b/java/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('java Server --Ice.PrintAdapterReady') server.expect('.* ready') -print "testing...", +sys.stdout.write("testing... ") sys.stdout.flush() client = Util.spawn('java Client') client.waitTestSuccess() server.expect('Hello World!') -print "ok" +print("ok") -import signal server.kill(signal.SIGINT) server.waitTestSuccess(-signal.SIGINT) diff --git a/java/demo/Ice/multicast/expect.py b/java/demo/Ice/multicast/expect.py index 8ea5eeefc5c..9d110c5bbee 100755 --- a/java/demo/Ice/multicast/expect.py +++ b/java/demo/Ice/multicast/expect.py @@ -16,10 +16,10 @@ 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.Ice import multicast multicast.run('java Client', 'java Server') diff --git a/java/demo/Ice/nested/expect.py b/java/demo/Ice/nested/expect.py index db61db0dc5f..aa794c47bfa 100755 --- a/java/demo/Ice/nested/expect.py +++ b/java/demo/Ice/nested/expect.py @@ -16,10 +16,10 @@ 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.Ice import nested server = Util.spawn('java Server --Ice.PrintAdapterReady') diff --git a/java/demo/Ice/plugin/expect.py b/java/demo/Ice/plugin/expect.py index 13bc3e25fd0..c3aec76b956 100755 --- a/java/demo/Ice/plugin/expect.py +++ b/java/demo/Ice/plugin/expect.py @@ -16,10 +16,10 @@ 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.Ice import plugin server = Util.spawn('java Server --Ice.PrintAdapterReady --Ice.Warn.Connections=0') diff --git a/java/demo/Ice/serialize/expect.py b/java/demo/Ice/serialize/expect.py index 78c9d42e285..76f88ed2885 100755 --- a/java/demo/Ice/serialize/expect.py +++ b/java/demo/Ice/serialize/expect.py @@ -16,10 +16,10 @@ 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.Ice import serialize server = Util.spawn('java Server --Ice.PrintAdapterReady --Ice.Warn.Connections=0') diff --git a/java/demo/Ice/session/expect.py b/java/demo/Ice/session/expect.py index 778788f74c9..f1a6d02f024 100755 --- a/java/demo/Ice/session/expect.py +++ b/java/demo/Ice/session/expect.py @@ -16,10 +16,10 @@ 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.Ice import session server = Util.spawn('java Server --Ice.PrintAdapterReady') diff --git a/java/demo/Ice/throughput/expect.py b/java/demo/Ice/throughput/expect.py index 067af651d57..6bc12313685 100755 --- a/java/demo/Ice/throughput/expect.py +++ b/java/demo/Ice/throughput/expect.py @@ -16,10 +16,10 @@ 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.Ice import throughput server = Util.spawn('java Server --Ice.PrintAdapterReady') diff --git a/java/demo/Ice/value/expect.py b/java/demo/Ice/value/expect.py index 964dbb0f66e..2c7292af39d 100755 --- a/java/demo/Ice/value/expect.py +++ b/java/demo/Ice/value/expect.py @@ -16,10 +16,10 @@ 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.Ice import value server = Util.spawn('java Server --Ice.PrintAdapterReady') diff --git a/java/demo/IceBox/hello/expect.py b/java/demo/IceBox/hello/expect.py index cb6a4638b24..318c713b864 100755 --- a/java/demo/IceBox/hello/expect.py +++ b/java/demo/IceBox/hello/expect.py @@ -16,10 +16,10 @@ 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.IceBox import hello # Override the service load line. diff --git a/java/demo/IceGrid/icebox/expect.py b/java/demo/IceGrid/icebox/expect.py index c08b13a77bc..19a74ca2f47 100755 --- a/java/demo/IceGrid/icebox/expect.py +++ b/java/demo/IceGrid/icebox/expect.py @@ -16,10 +16,10 @@ 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.IceGrid import icebox icebox.run('java Client') diff --git a/java/demo/IceGrid/simple/expect.py b/java/demo/IceGrid/simple/expect.py index 2b990944d05..4390cf4a0e0 100755 --- a/java/demo/IceGrid/simple/expect.py +++ b/java/demo/IceGrid/simple/expect.py @@ -16,10 +16,10 @@ 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.IceGrid import simple simple.run('java Client') diff --git a/java/demo/IceStorm/clock/expect.py b/java/demo/IceStorm/clock/expect.py index 98cfc0f978c..8fd1422d20a 100755 --- a/java/demo/IceStorm/clock/expect.py +++ b/java/demo/IceStorm/clock/expect.py @@ -16,10 +16,10 @@ 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.IceStorm import clock clock.run('java Subscriber', 'java Publisher') diff --git a/java/demo/book/evictor_filesystem/expect.py b/java/demo/book/evictor_filesystem/expect.py index 5915b407b27..4a6dcd0af06 100755 --- a/java/demo/book/evictor_filesystem/expect.py +++ b/java/demo/book/evictor_filesystem/expect.py @@ -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.book import evictor_filesystem -print "cleaning databases...", +sys.stdout.write("cleaning databases... ") sys.stdout.flush() Util.cleanDbDir("db") -print "ok" +print("ok") server = Util.spawn('java Server --Ice.PrintAdapterReady') server.expect('.* ready') diff --git a/java/demo/book/lifecycle/expect.py b/java/demo/book/lifecycle/expect.py index 832dadac6ee..9bd197db805 100755 --- a/java/demo/book/lifecycle/expect.py +++ b/java/demo/book/lifecycle/expect.py @@ -16,10 +16,10 @@ 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.book import lifecycle server = Util.spawn('java Server --Ice.PrintAdapterReady') diff --git a/java/demo/book/map_filesystem/expect.py b/java/demo/book/map_filesystem/expect.py index c78a186d65c..ed3e13a0a65 100755 --- a/java/demo/book/map_filesystem/expect.py +++ b/java/demo/book/map_filesystem/expect.py @@ -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.book import map_filesystem -print "cleaning databases...", +sys.stdout.write("cleaning databases... ") sys.stdout.flush() Util.cleanDbDir("db") -print "ok" +print("ok") server = Util.spawn('java Server --Ice.PrintAdapterReady') server.expect('.* ready') diff --git a/java/demo/book/printer/expect.py b/java/demo/book/printer/expect.py index d08e5413ca5..987016ddc2f 100755 --- a/java/demo/book/printer/expect.py +++ b/java/demo/book/printer/expect.py @@ -8,7 +8,7 @@ # # ********************************************************************** -import sys, os +import sys, os, signal path = [ ".", "..", "../..", "../../..", "../../../.." ] head = os.path.dirname(sys.argv[0]) @@ -16,20 +16,19 @@ 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 * -import signal +from demoscript import Util server = Util.spawn('java Server --Ice.PrintAdapterReady') server.expect('.* ready') -print "testing...", +sys.stdout.write("testing... ") sys.stdout.flush() client = Util.spawn('java Client') client.waitTestSuccess() server.expect('Hello World!') server.kill(signal.SIGINT) server.waitTestSuccess() -print "ok" +print("ok") diff --git a/java/demo/book/simple_filesystem/expect.py b/java/demo/book/simple_filesystem/expect.py index 0465e2a8d9e..21e631c420a 100755 --- a/java/demo/book/simple_filesystem/expect.py +++ b/java/demo/book/simple_filesystem/expect.py @@ -8,7 +8,7 @@ # # ********************************************************************** -import sys, os +import sys, os, signal path = [ ".", "..", "../..", "../../..", "../../../.." ] head = os.path.dirname(sys.argv[0]) @@ -16,20 +16,19 @@ 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 * -import signal +from demoscript import Util server = Util.spawn('java Server --Ice.PrintAdapterReady') server.expect('.* ready') -print "testing...", +sys.stdout.write("testing... ") sys.stdout.flush() client = Util.spawn('java Client') client.expect('Contents of root directory:\n.*Down to a sunless sea.') client.waitTestSuccess() server.kill(signal.SIGINT) server.waitTestSuccess() -print "ok" +print("ok") |