diff options
Diffstat (limited to 'demoscript/Ice/throughput.py')
| -rwxr-xr-x | demoscript/Ice/throughput.py | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/demoscript/Ice/throughput.py b/demoscript/Ice/throughput.py index a9c3c968c08..f490fa0788c 100755 --- a/demoscript/Ice/throughput.py +++ b/demoscript/Ice/throughput.py @@ -8,7 +8,7 @@ # # ********************************************************************** -import pexpect, sys, demoscript +import sys, demoscript def runseries(client): client.expect('==> ', timeout=240) @@ -17,45 +17,42 @@ def runseries(client): client.expect('==> ', timeout=240) print "twoway: %s " % (client.before) + if not demoscript.Util.fast: + client.sendline('o') - client.sendline('o') + client.expect('o') + client.expect('==> ', timeout=240) + print "oneway: %s " % (client.before) - client.expect('o') - client.expect('==> ', timeout=240) - print "oneway: %s " % (client.before) + client.sendline('r') + client.expect('r') - client.sendline('r') - client.expect('r') + client.expect('==> ', timeout=240) + print "receive: %s" % (client.before) + client.sendline('e') + client.expect('e') - client.expect('==> ', timeout=240) - print "receive: %s" % (client.before) - client.sendline('e') - client.expect('e') - - client.expect('==> ', timeout=240) - print "echo: %s" % (client.before) + client.expect('==> ', timeout=240) + print "echo: %s" % (client.before) def run(client, server): print "testing bytes" runseries(client) - if not demoscript.Util.fast: - print "testing strings" - client.sendline('2') - runseries(client) + print "testing strings" + client.sendline('2') + runseries(client) - print "testing structs with string... " - client.sendline('3') - runseries(client) + print "testing structs with string... " + client.sendline('3') + runseries(client) - print "testing structs with two ints and double... " - client.sendline('4') - runseries(client) + print "testing structs with two ints and double... " + client.sendline('4') + runseries(client) client.sendline('s') - server.expect(pexpect.EOF) - assert server.wait() == 0 + server.waitTestSuccess() client.sendline('x') - client.expect(pexpect.EOF) - assert client.wait() == 0 + client.waitTestSuccess() |