summaryrefslogtreecommitdiff
path: root/demoscript/book/lifecycle.py
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2008-06-12 15:02:56 +0800
committerMatthew Newhook <matthew@zeroc.com>2008-06-12 15:02:56 +0800
commit8a8d023b9f2cdd9ee235f5a8a4893ef313770457 (patch)
treefbe10aac8d1d00c9fe67f2f2cdf3bb9ce25a2fdf /demoscript/book/lifecycle.py
parentcygwin python is no longer required under Windows to run the expect scripts. (diff)
downloadice-8a8d023b9f2cdd9ee235f5a8a4893ef313770457.tar.bz2
ice-8a8d023b9f2cdd9ee235f5a8a4893ef313770457.tar.xz
ice-8a8d023b9f2cdd9ee235f5a8a4893ef313770457.zip
fix some demoscript problems discovered under w2008.
Diffstat (limited to 'demoscript/book/lifecycle.py')
-rwxr-xr-xdemoscript/book/lifecycle.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/demoscript/book/lifecycle.py b/demoscript/book/lifecycle.py
index b4c005dae44..5f285ca0e60 100755
--- a/demoscript/book/lifecycle.py
+++ b/demoscript/book/lifecycle.py
@@ -89,14 +89,7 @@ def run(client, server):
client.expect('^> ')
client.sendline('lr')
- #client.expect('lr\n')
- i = client.expect(['a \(file\)\n', 'b \(directory\):\n'])
- if i == 1:
- client.expect('c \(directory\):\n')
- client.expect('a \(file\)\n')
- else:
- client.expect('b \(directory\):\n')
- client.expect('c \(directory\):\n')
+ client.expectall(['a \(file\)\n', 'b \(directory\):\n\tc \(directory\):\n'])
client.expect('^> ')
client.sendline('mkfile c')