D-Bus testing: further tweaks for failure tests

A hyphen crept into one of the string replacements, thus disabling
it although needed sometimes. Also updated another check to be more
flexible.
This commit is contained in:
Patrick Ohly 2012-08-02 06:38:02 +00:00
parent a01c094fb6
commit 67d7ce2673
1 changed files with 6 additions and 5 deletions

View File

@ -6879,10 +6879,11 @@ END:VCARD
# The error message is not particularly informative, but the error should
# not occur, so let it be... Also, the "connection is closed" error only
# occurs occasionally.
out = out.replace('''[ERROR] The connection is closed
''', '')
self.assertEqualDiff(out, '''[ERROR syncevo-dbus-server] child process quit because of signal 9
''')
self.assertNotEqual(out, '')
self.assertTrue('''[ERROR] The connection is closed
''' in out or
'''[ERROR syncevo-dbus-server] child process quit because of signal 9
''' in out)
@property("debug", False)
@property("ENV", "SYNCEVOLUTION_LOCAL_CHILD_DELAY2=60")
@ -6937,7 +6938,7 @@ END:VCARD
# occurs occasionally.
if out.startswith('[ERROR] child process quit because of signal 9'):
out = out.replace('''[ERROR] sending message to child failed: The connection is closed
-''', '')
''', '')
self.assertEqualDiff(out, '''[ERROR] child process quit because of signal 9
[ERROR] local transport failed: child process quit because of signal 9
[INFO] Transport giving up after x retries and y:zzmin