From: david-sarah Date: Tue, 11 Oct 2011 00:22:27 +0000 (-0700) Subject: test/common.py: in shouldFail and shouldHTTPError, when the raised exception does... X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/vdrive?a=commitdiff_plain;h=5ae446fbd290273eb4eb1f52abec0d6a04c214ab;p=tahoe-lafs%2Ftahoe-lafs.git 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. --- diff --git a/src/allmydata/test/common.py b/src/allmydata/test/common.py index 42890d81..5f379003 100644 --- a/src/allmydata/test/common.py +++ b/src/allmydata/test/common.py @@ -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)