Only expect further message in non-name-error first case

transport_cleaning
Tyler Goodlet 2021-07-04 12:55:36 -04:00
parent 6aab16f877
commit 55760b3fe0
1 changed files with 6 additions and 4 deletions

View File

@ -309,7 +309,7 @@ def test_multi_daemon_subactors(spawn, loglevel):
next_msg = name_error_msg next_msg = name_error_msg
elif name_error_msg in before: elif name_error_msg in before:
next_msg = bp_forever_msg next_msg = None
else: else:
raise ValueError("Neither log msg was found !?") raise ValueError("Neither log msg was found !?")
@ -320,7 +320,8 @@ def test_multi_daemon_subactors(spawn, loglevel):
child.expect(r"\(Pdb\+\+\)") child.expect(r"\(Pdb\+\+\)")
before = str(child.before.decode()) before = str(child.before.decode())
assert next_msg in before if next_msg:
assert next_msg in before
child.sendline('c') child.sendline('c')
@ -331,9 +332,10 @@ def test_multi_daemon_subactors(spawn, loglevel):
try: try:
child.sendline('c') child.sendline('c')
child.expect(pexpect.EOF) child.expect(pexpect.EOF)
except pexpect.exceptions.TIMEOUT:
# Failed to exit using continue..?
except pexpect.exceptions.TIMEOUT:
# Failed to exit using continue..?
child.sendline('q') child.sendline('q')
child.expect(pexpect.EOF) child.expect(pexpect.EOF)