ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-19 16:20:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change shouldFail to avoid Unicode errors when converting Failure to str

Browse Source
This commit is contained in:
david-sarah 2010-05-11 23:07:54 -07:00
parent 01e59aab8d
commit e706f043f0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/allmydata/test/common.py
View File

@ -1090,8 +1090,8 @@ class ShouldFailMixin:
error message, if any, because Deferred chains frequently make it
difficult to tell which assertion was tripped.
The substring= argument, if not None, must appear inside the
stringified Failure, or the test will fail.
The substring= argument, if not None, must appear in the 'repr'
of the message wrapped by this Failure, or the test will fail.
"""
assert substring is None or isinstance(substring, str)
@ -1100,9 +1100,10 @@ class ShouldFailMixin:
if isinstance(res, failure.Failure):
res.trap(expected_failure)
if substring:
self.failUnless(substring in str(res),
message = repr(res.value.args[0])
self.failUnless(substring in message,
"substring '%s' not in '%s'"
% (substring, str(res)))
% (substring, message))
else:
self.fail("%s was supposed to raise %s, not get '%s'" %
(which, expected_failure, res))