diff options
Diffstat (limited to 'demoscript')
| -rwxr-xr-x | demoscript/Freeze/transform.py | 1 | ||||
| -rwxr-xr-x | demoscript/Glacier2/callback.py | 3 | ||||
| -rw-r--r-- | demoscript/Ice/hello.py | 2 | ||||
| -rw-r--r-- | demoscript/Ice/protobuf.py | 30 | ||||
| -rw-r--r-- | demoscript/Ice/serialize.py | 40 | ||||
| -rw-r--r-- | demoscript/Util.py | 21 | ||||
| -rwxr-xr-x | demoscript/book/freeze_filesystem.py | 7 |
7 files changed, 90 insertions, 14 deletions
diff --git a/demoscript/Freeze/transform.py b/demoscript/Freeze/transform.py index e37fd57b0c9..55136aaef3b 100755 --- a/demoscript/Freeze/transform.py +++ b/demoscript/Freeze/transform.py @@ -55,6 +55,7 @@ def run(createCmd, recreateCmd, readCmd, readnewCmd): readnew.expect('All contacts \(default order\)') readnew.expect('All contacts \(ordered by phone number\)') readnew.expect('DbEnv \"dbnew\": Secondary index corrupt: not consistent with primary') + readnew.waitTestSuccess(1) print "ok" print "recreating database...", diff --git a/demoscript/Glacier2/callback.py b/demoscript/Glacier2/callback.py index 550306dc7ca..f0058a813ba 100755 --- a/demoscript/Glacier2/callback.py +++ b/demoscript/Glacier2/callback.py @@ -54,9 +54,9 @@ def run(client, server, sessionserver, glacier2): sys.stdout.flush() client.sendline('v') client.sendline('t') + glacier2.expect('_fwd/t, _ovrd/some_value') server.expect('initiating callback to') client.expect('received callback') - glacier2.expect('_fwd/t, _ovrd/some_value') print "ok" print "testing fake category...", @@ -65,7 +65,6 @@ def run(client, server, sessionserver, glacier2): client.sendline('F') client.sendline('t') server.expect('initiating callback to.*fake.*ObjectNotExistException') - glacier2.expect('_fwd/t, _ovrd/some_value') try: client.expect('received callback', timeout=1) except Expect.TIMEOUT: diff --git a/demoscript/Ice/hello.py b/demoscript/Ice/hello.py index a003b0c9598..a5a1624b9d3 100644 --- a/demoscript/Ice/hello.py +++ b/demoscript/Ice/hello.py @@ -59,7 +59,7 @@ def runtests(client, server, secure): client.sendline('P') client.expect('server delay is now set to 2500ms') client.sendline('t') - client.expect('.*TimeoutException.*', timeout=5) + client.expect('.*TimeoutException.*', timeout=10) server.expect('Hello World!') server.expect('Hello World!') # second because op is idempotent client.sendline('P') diff --git a/demoscript/Ice/protobuf.py b/demoscript/Ice/protobuf.py new file mode 100644 index 00000000000..23ad94fc48d --- /dev/null +++ b/demoscript/Ice/protobuf.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2009 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. +# +# ********************************************************************** + +import sys +from demoscript import * +from scripts import Expect + +def run(client, server): + print "testing...", + sys.stdout.flush() + client.sendline('t') + server.expect('Hello World from id: 1') + server.expect('name: "Fred Jones"') + server.expect('email: "fred@jones.com"') + print "ok" + + print "shutting down...", + client.sendline('s') + server.waitTestSuccess() + + client.sendline('x') + client.waitTestSuccess() + print "ok" diff --git a/demoscript/Ice/serialize.py b/demoscript/Ice/serialize.py new file mode 100644 index 00000000000..77a3ca03d29 --- /dev/null +++ b/demoscript/Ice/serialize.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python +# ********************************************************************** +# +# Copyright (c) 2003-2009 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. +# +# ********************************************************************** + +import sys +from demoscript import * +from scripts import Expect + +def runtests(client, server, secure): + print "testing greeting...", + sys.stdout.flush() + client.sendline('g') + server.expect('Hello there!') + client.sendline('g') + server.expect('Hello there!') + print "ok" + + print "testing null greeting...", + sys.stdout.flush() + client.sendline('t') + client.sendline('g') + server.expect('Received null greeting') + client.sendline('g') + server.expect('Received null greeting') + print "ok" + +def run(client, server): + runtests(client, server, False) + + client.sendline('s') + server.waitTestSuccess() + + client.sendline('x') + client.waitTestSuccess() diff --git a/demoscript/Util.py b/demoscript/Util.py index bc5418248b7..d0352171e7d 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -33,6 +33,7 @@ from scripts import Expect keepGoing = False iceHome = None x64 = False +java2 = False preferIPv4 = False demoErrors = [] @@ -82,7 +83,10 @@ def configurePaths(): # if iceHome == "/usr": javaDir = os.path.join("/", "usr", "share", "java") - addenv("CLASSPATH", os.path.join(javaDir, "Ice.jar")) + if java2: + addenv("CLASSPATH", os.path.join(javaDir, "Ice-java2.jar")) + else: + addenv("CLASSPATH", os.path.join(javaDir, "Ice.jar")) addenv("CLASSPATH", "classes") return # That's it, we're done! @@ -306,13 +310,14 @@ def runDemos(start, args, demos, num = 0, script = False, root = False): demoErrors.append(message) -def run(demos, root = False): +def run(demos, protobufDemos = [], root = False): def usage(): print """usage: %s --start=index Start running the demos at the given demo." --loop Run the demos in a loop." --filter=<regex> Run all the demos that match the given regex." --rfilter=<regex> Run all the demos that do not match the given regex." + --protobuf Run the protobuf demos." --debug Display debugging information on each demos." --trace=<output> Run the demos with tracing enabled." --host=host Set --Ice.Default.Host=<host>." @@ -332,7 +337,7 @@ def run(demos, root = False): try: opts, args = getopt.getopt(sys.argv[1:], "lr:R:", [ "filter=", "rfilter=", "start=", "loop", "fast", "trace=", "debug", "host=", "mode=", - "continue", "ice-home=", "x64", "preferIPv4", "env", "noenv", "script"]) + "continue", "ice-home=", "x64", "java2", "preferIPv4", "env", "noenv", "script", "protobuf"]) except getopt.GetoptError: usage() @@ -376,6 +381,8 @@ def run(demos, root = False): start = int(a) elif o in '--script': script = True + elif o in '--protobuf': + demos = demos + protobufDemos for demoFilter, removeFilter in filters: if removeFilter: @@ -522,7 +529,7 @@ def processCmdLine(): print "usage: " + sys.argv[0] + " --x64 --preferIPv4 --env --noenv --fast --trace=output --debug --host host --mode=[debug|release] --ice-home=<dir>" sys.exit(2) try: - opts, args = getopt.getopt(sys.argv[1:], "", ["env", "noenv", "x64", "preferIPv4", "fast", "trace=", "debug", "host=", "mode=", "ice-home="]) + opts, args = getopt.getopt(sys.argv[1:], "", ["env", "noenv", "x64", "java2", "preferIPv4", "fast", "trace=", "debug", "host=", "mode=", "ice-home="]) except getopt.GetoptError: usage() @@ -531,6 +538,7 @@ def processCmdLine(): global tracefile global buildmode global x64 + global java2 global preferIPv4 global debug global host @@ -540,6 +548,7 @@ def processCmdLine(): trace = False buildmode = None x64 = False + java2 = False tracefile = None env = False noenv = False @@ -562,13 +571,15 @@ def processCmdLine(): fast = True if o == "--x64": x64 = True + if o == "--java2": + java2 = True if o == "--preferIPv4": preferIPv4 = True if o == "--ice-home": iceHome = a if o == "--mode": buildmode = a - if buildmode != 'debug' and mode != 'release': + if buildmode != 'debug' and buildmode != 'release': usage() if host != "": diff --git a/demoscript/book/freeze_filesystem.py b/demoscript/book/freeze_filesystem.py index 55f0f1d8764..bf9ea01f3de 100755 --- a/demoscript/book/freeze_filesystem.py +++ b/demoscript/book/freeze_filesystem.py @@ -14,17 +14,12 @@ def run(client, server): print "testing...", sys.stdout.flush() client.expect('Created Coleridge/Kubla_Khan') - server.expect('added') client.expect('Contents of filesystem:') - server.expect('added') - server.expect('added') - server.expect('locate') - server.expect('locate') client.expect('Down to a sunless sea') - server.expect('locate') client.expectall(['Destroying Coleridge', 'Destroying README']) server.expect('removed object') server.expect('removed object') + server.expect('removed object') client.waitTestSuccess() print "ok" |