diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-03-26 14:43:16 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-03-26 14:43:16 +0800 |
| commit | 7131339b398cc2f33162ed33aa71fa25b25afd89 (patch) | |
| tree | ccaae767eb1cbe9c1071b3c5e11413585e66e29f /demoscript/IceGrid/icebox.py | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-7131339b398cc2f33162ed33aa71fa25b25afd89.tar.bz2 ice-7131339b398cc2f33162ed33aa71fa25b25afd89.tar.xz ice-7131339b398cc2f33162ed33aa71fa25b25afd89.zip | |
minor cleanup to IceGrid/icebox expect script.
Diffstat (limited to 'demoscript/IceGrid/icebox.py')
| -rwxr-xr-x | demoscript/IceGrid/icebox.py | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/demoscript/IceGrid/icebox.py b/demoscript/IceGrid/icebox.py index 55d36cd551b..3826cb30631 100755 --- a/demoscript/IceGrid/icebox.py +++ b/demoscript/IceGrid/icebox.py @@ -56,25 +56,11 @@ def run(clientStr, desc = 'application'): print "testing client...", sys.stdout.flush() - client = demoscript.Util.spawn(clientStr) - node.expect("Hello from Homer") - client.waitTestSuccess(timeout=1) - - client = demoscript.Util.spawn(clientStr) - node.expect("Hello from Marge") - client.waitTestSuccess(timeout=1) - - client = demoscript.Util.spawn(clientStr) - node.expect("Hello from Bart") - client.waitTestSuccess(timeout=1) + for s in [ "Homer", "Marge", "Bart", "Lisa", "Maggie" ]: + client = demoscript.Util.spawn(clientStr) + node.expect("Hello from %s" % s) + client.waitTestSuccess(timeout=1) - client = demoscript.Util.spawn(clientStr) - node.expect("Hello from Lisa") - client.waitTestSuccess(timeout=1) - - client = demoscript.Util.spawn(clientStr) - node.expect("Hello from Maggie") - client.waitTestSuccess(timeout=1) print "ok" print "testing stop/start of services...", |