ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-18 17:00:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test/common: rearrange shouldHTTPError

Browse Source
This commit is contained in:
Brian Warner 2009-03-03 19:40:59 -07:00
parent c4bda3daa3
commit 53f50fcc78
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1075,32 +1075,35 @@ class WebErrorMixin:
print "Web Error:", f.value, ":", f.value.response
return f
def _shouldHTTPError(self, res, which, code=None, substring=None,
response_substring=None):
def _shouldHTTPError(self, res, which, validator):
if isinstance(res, failure.Failure):
res.trap(WebError)
if code is not None:
self.failUnlessEqual(res.value.status, str(code))
if substring:
self.failUnless(substring in str(res),
"substring '%s' not in '%s'"
% (substring, str(res)))
if response_substring:
self.failUnless(response_substring in res.value.response,
"response substring '%s' not in '%s'"
% (response_substring, res.value.response))
return validator(res)
else:
self.fail("%s was supposed to Error(%s), not get '%s'" %
(which, code, res))
self.fail("%s was supposed to Error, not get '%s'" % (which, res))
def shouldHTTPError(self, which,
code=None, substring=None, response_substring=None,
callable=None, *args, **kwargs):
# returns a Deferred with the response body
assert substring is None or isinstance(substring, str)
assert callable
def _validate(f):
if code is not None:
self.failUnlessEqual(f.value.status, str(code))
if substring:
code_string = str(f)
self.failUnless(substring in code_string,
"substring '%s' not in '%s'"
% (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))
return response_body
d = defer.maybeDeferred(callable, *args, **kwargs)
d.addBoth(self._shouldHTTPError, which,
code, substring, response_substring)
d.addBoth(self._shouldHTTPError, which, _validate)
return d
class ErrorMixin(WebErrorMixin):