ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-31 08:25:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test/common.py: in shouldFail and shouldHTTPError, when the raised exception does not include the expected substring (or, for shouldHTTPError, when the status code is wrong), mention which test that happened in.

Browse Source
This commit is contained in:
david-sarah 2011-10-10 17:22:27 -07:00
parent cf9bf2ea10
commit 5ae446fbd2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1069,8 +1069,8 @@ class ShouldFailMixin:
if substring:
message = repr(res.value.args[0])
self.failUnless(substring in message,
"substring '%s' not in '%s'"
% (substring, message))
"%s: substring '%s' not in '%s'"
% (which, substring, message))
else:
self.fail("%s was supposed to raise %s, not get '%s'" %
(which, expected_failure, res))
@ -1103,17 +1103,17 @@ class WebErrorMixin:
assert callable
def _validate(f):
if code is not None:
self.failUnlessEqual(f.value.status, str(code))
self.failUnlessEqual(f.value.status, str(code), which)
if substring:
code_string = str(f)
self.failUnless(substring in code_string,
"substring '%s' not in '%s'"
% (substring, code_string))
"%s: substring '%s' not in '%s'"
% (which, substring, code_string))
response_body = f.value.response
if response_substring:
self.failUnless(response_substring in response_body,
"response substring '%s' not in '%s'"
% (response_substring, response_body))
"%s: response substring '%s' not in '%s'"
% (which, response_substring, response_body))
return response_body
d = defer.maybeDeferred(callable, *args, **kwargs)
d.addBoth(self._shouldHTTPError, which, _validate)