ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-23 23:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test_web: move shouldHTTPError into common.WebErrorMixin

Browse Source
This commit is contained in:
Brian Warner 2009-03-03 16:56:20 -07:00
parent 559c369574
commit f15c0be5af
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1074,6 +1074,35 @@ class WebErrorMixin:
f.trap(WebError)
print "Web Error:", f.value, ":", f.value.response
return f
def _shouldHTTPError(self, res, which, code=None, substring=None,
response_substring=None):
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))
else:
self.fail("%s was supposed to Error(%s), not get '%s'" %
(which, code, res))
def shouldHTTPError(self, which,
code=None, substring=None, response_substring=None,
callable=None, *args, **kwargs):
assert substring is None or isinstance(substring, str)
assert callable
d = defer.maybeDeferred(callable, *args, **kwargs)
d.addBoth(self._shouldHTTPError, which,
code, substring, response_substring)
return d
class ErrorMixin(WebErrorMixin):
def explain_error(self, f):
if f.check(defer.FirstError):

30
src/allmydata/test/test_web.py
View File

@ -362,36 +362,8 @@ class WebMixin(object):
self.fail("%s was supposed to Error(404), not get '%s'" %
(which, res))
def _shouldHTTPError(self, res, which, code=None, substring=None,
response_substring=None):
if isinstance(res, failure.Failure):
res.trap(error.Error)
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))
else:
self.fail("%s was supposed to Error(%s), not get '%s'" %
(which, code, res))
def shouldHTTPError(self, which,
code=None, substring=None, response_substring=None,
callable=None, *args, **kwargs):
assert substring is None or isinstance(substring, str)
assert callable
d = defer.maybeDeferred(callable, *args, **kwargs)
d.addBoth(self._shouldHTTPError, which,
code, substring, response_substring)
return d
class Web(WebMixin, testutil.StallMixin, unittest.TestCase):
class Web(WebMixin, WebErrorMixin, testutil.StallMixin, unittest.TestCase):
def test_create(self):
pass