diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2007-08-24 14:41:39 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2007-08-24 14:41:39 +0800 |
| commit | 9ff48829c8669fbef8c7ca6a9b8bab99c77db2f9 (patch) | |
| tree | 7fa0a0406be0386a8314b2e8c742f29bf127b70d /demoscript/Freeze | |
| parent | Merge branch 'bug1319' (diff) | |
| download | ice-9ff48829c8669fbef8c7ca6a9b8bab99c77db2f9.tar.bz2 ice-9ff48829c8669fbef8c7ca6a9b8bab99c77db2f9.tar.xz ice-9ff48829c8669fbef8c7ca6a9b8bab99c77db2f9.zip | |
Squashed commit of the following:
commit d74cec9e6c77e70b33883f517b1bb6f97b2ffa5e
Author: Matthew Newhook <matthew@zeroc.com>
Date: Fri Aug 24 14:33:06 2007 +0800
updates.
commit 643b31f979a00ea5397206ca59f20bb58c62660e
Author: Matthew Newhook <matthew@zeroc.com>
Date: Fri Aug 24 14:32:35 2007 +0800
added some .gitignore rules.
commit 1510d38798976753b435f32308e79acd9fcd2722
Author: Matthew Newhook <matthew@zeroc.com>
Date: Fri Aug 24 14:05:10 2007 +0800
removed bogus use of 127.0.0.1
commit 3c91e89b01af20a0dacfdbc1fbeca1c67c796656
Author: Matthew Newhook <matthew@zeroc.com>
Date: Fri Aug 24 14:01:43 2007 +0800
Verify that cygwin python is used under Windows.
commit ff160725c051eedb28a42d9dd69f0d8aa297e522
Author: Matthew Newhook <matthew@zeroc.com>
Date: Fri Aug 24 13:55:03 2007 +0800
bump timeout for the node to terminate. killing the node leaves the servers running under cygwin
commit ec3bddb58e861f906bf39aee1fa818c3e9a50000
Author: Matthew Newhook <matthew@zeroc.com>
Date: Fri Aug 24 13:48:55 2007 +0800
added back accidently removed files.
commit f9ea2f552d7f576ebfa878669925f4184a89257b
Author: Matthew Newhook <matthew@zeroc.com>
Date: Fri Aug 24 13:47:47 2007 +0800
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2427, http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2422
commit 8a309ca0036dba7ecbd577edb2d737fa41174a5a
Author: Matthew Newhook <matthew@zeroc.com>
Date: Fri Aug 24 10:06:53 2007 +0800
added ruby support to the expect scripts.
commit 34597c1ee6d80d6754c9e925bd376125dd104a5f
Author: Matthew Newhook <matthew@zeroc.com>
Date: Fri Aug 24 09:26:10 2007 +0800
added pexpect to git repository.
commit 4bd2e1f2b52bcb9906b03ac216db686b8229b545
Author: Matthew Newhook <matthew@zeroc.com>
Date: Thu Aug 23 18:49:51 2007 +0800
numerous UNIX expect script fixes.
commit 25ab4a812f45a6e908d5d2d7ab03e557d79afa9f
Author: Matthew Newhook <matthew@zeroc.com>
Date: Thu Aug 23 16:47:08 2007 +0800
generate configuration files for IceGrid icebox/iceboxd
commit 6bb57bf7ed21d7256963c228aaf0b20657367a47
Author: Matthew Newhook <matthew@zeroc.com>
Date: Thu Aug 23 15:16:55 2007 +0800
added python & C# support to the expect scripts.
commit 08f1a59971ad3a52a4357069554dcc309b2d062b
Author: Matthew Newhook <matthew@zeroc.com>
Date: Wed Aug 22 14:23:53 2007 +0800
java expect scripts complete.
commit 3918f4ff3beea3005001bc55c5502c0825d8b7ea
Author: Matthew Newhook <matthew@zeroc.com>
Date: Wed Aug 22 13:30:31 2007 +0800
first set of expect changes.
Diffstat (limited to 'demoscript/Freeze')
| -rwxr-xr-x | demoscript/Freeze/bench.py | 5 | ||||
| -rwxr-xr-x | demoscript/Freeze/library.py | 10 | ||||
| -rwxr-xr-x | demoscript/Freeze/phonebook.py | 10 |
3 files changed, 20 insertions, 5 deletions
diff --git a/demoscript/Freeze/bench.py b/demoscript/Freeze/bench.py index 67934186d87..1270396bc49 100755 --- a/demoscript/Freeze/bench.py +++ b/demoscript/Freeze/bench.py @@ -8,7 +8,7 @@ # # ********************************************************************** -import pexpect, sys +import sys def run(client, isJava=False): if isJava: @@ -63,6 +63,5 @@ def run(client, isJava=False): print "%s " % (client.before) print "IntIntMap with index (read test):" - client.expect(pexpect.EOF, timeout=200) - assert client.wait() == 0 + client.waitTestSuccess(timeout=200) print "%s " % (client.before) diff --git a/demoscript/Freeze/library.py b/demoscript/Freeze/library.py index 9212c18138f..9bed186678a 100755 --- a/demoscript/Freeze/library.py +++ b/demoscript/Freeze/library.py @@ -8,7 +8,8 @@ # # ********************************************************************** -import pexpect, sys +import sys +import demoscript.pexpect as pexpect def dequote(s): cur = 0 @@ -146,4 +147,11 @@ def run(client, server): client.sendline('remove') #server.expect(['locate could not find', 'locate found.*but it was dead or destroyed']) client.expect('current book no longer exists') + + client.sendline('shutdown') + if client != server: + server.waitTestSuccess() + client.sendline('exit') + client.waitTestSuccess() + print "ok" diff --git a/demoscript/Freeze/phonebook.py b/demoscript/Freeze/phonebook.py index a2d14bf2d14..aca68a95996 100755 --- a/demoscript/Freeze/phonebook.py +++ b/demoscript/Freeze/phonebook.py @@ -8,7 +8,8 @@ # # ********************************************************************** -import pexpect, sys +import sys +import demoscript.pexpect as pexpect def dequote(s): cur = 0 @@ -87,4 +88,11 @@ def run(client, server): client.expect('current contact no longer exists') client.sendline('find foo') client.expect('number of contacts found: 0') + + client.sendline('shutdown') + if client != server: + server.waitTestSuccess() + client.sendline('exit') + client.waitTestSuccess() + print "ok" |