kanaka/mal
1
1
Fork 0
mirror of https://github.com/kanaka/mal.git synced 2024-09-17 16:47:22 +03:00
Code Issues Projects Releases Wiki Activity

runtest.py: more generic prompt matching.

Browse Source
This commit is contained in:
Joel Martin 2018-11-28 21:04:44 -06:00
parent b5ec219b49
commit 96c09dcd40
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runtest.py
View File

@ -145,7 +145,7 @@ class Runner():
match = regexp.search(self.buf)
if match:
end = match.end()
buf = self.buf[0:end-len(prompt)]
buf = self.buf[0:match.start()]
self.buf = self.buf[end:]
self.last_prompt = prompt
return buf
@ -254,7 +254,7 @@ def assert_prompt(runner, prompts, timeout):
# Wait for the initial prompt
try:
assert_prompt(r, ['user> ', 'mal-user> '], args.start_timeout)
assert_prompt(r, ['[^\s()<>]+> '], args.start_timeout)
except:
_, exc, _ = sys.exc_info()
log("\nException: %s" % repr(exc))
@ -299,8 +299,7 @@ while t.next():
r.writeline(t.form)
try:
test_cnt += 1
res = r.read_to_prompt(['\r\nuser> ', '\nuser> ',
'\r\nmal-user> ', '\nmal-user> '],
res = r.read_to_prompt(['\r\n[^\s()<>]+> ', '\n[^\s()<>]+> '],
timeout=args.test_timeout)
#print "%s,%s,%s" % (idx, repr(p.before), repr(p.after))
if t.ret == "*" or res in expected: