summaryrefslogtreecommitdiff
path: root/demoscript/Ice/nested.py
diff options
context:
space:
mode:
Diffstat (limited to 'demoscript/Ice/nested.py')
-rwxr-xr-xdemoscript/Ice/nested.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/demoscript/Ice/nested.py b/demoscript/Ice/nested.py
index f0a9e116009..4c67f7e346b 100755
--- a/demoscript/Ice/nested.py
+++ b/demoscript/Ice/nested.py
@@ -9,6 +9,7 @@
# **********************************************************************
import sys, signal
+from demoscript import *
def run(client, server):
print "testing nested...",
@@ -18,17 +19,17 @@ def run(client, server):
client.expect('.*for exit:')
client.sendline('2')
server.expect('2')
- client.expect('1\r{1,2}\n.*for exit:')
+ client.expect('1\n.*for exit:')
client.sendline('3')
- server.expect('3\r{1,2}\n1')
- client.expect('2\r{1,2}\n.*for exit:')
+ server.expect('3\n1')
+ client.expect('2\n.*for exit:')
print "ok"
print "testing blocking...",
sys.stdout.flush()
client.sendline('21') # This will cause a block.
- server.expect('\r{1,2}\n'.join(['13', '11', '9', '7', '5', '3']))
- client.expect('\r{1,2}\n'.join(['12', '10', '8', '6', '4', '2']))
+ server.expect('\n'.join(['13', '11', '9', '7', '5', '3']))
+ client.expect('\n'.join(['12', '10', '8', '6', '4', '2']))
client.expect('TimeoutException', timeout=3000)
server.expect('TimeoutException', timeout=3000)
print "ok"