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

Use a helper to exercise render() in storage test cases

Browse Source
This commit is contained in:
Sajith Sasidharan 2020-03-05 15:45:18 -05:00
parent 554c477cea
commit 110734daf0
1 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/allmydata/test/test_storage.py
View File

@ -30,6 +30,7 @@ from allmydata.mutable.layout import MDMFSlotWriteProxy, MDMFSlotReadProxy, \
from allmydata.interfaces import BadWriteEnablerError from allmydata.interfaces import BadWriteEnablerError
from allmydata.test.common import LoggingServiceParent, ShouldFailMixin from allmydata.test.common import LoggingServiceParent, ShouldFailMixin
from allmydata.test.common_web import WebRenderingMixin from allmydata.test.common_web import WebRenderingMixin
from nevow.testutil import FakeRequest
from allmydata.test.no_network import NoNetworkServer from allmydata.test.no_network import NoNetworkServer
from allmydata.web.storage import ( from allmydata.web.storage import (
StorageStatus, StorageStatus,
@ -2972,6 +2973,29 @@ def renderSynchronously(ss):
deferred = flattenString(None, elem) deferred = flattenString(None, elem)
return unittest.TestCase().successResultOf(deferred) return unittest.TestCase().successResultOf(deferred)
def renderDeferred(resource, **kwargs):
"""
Use this to exercise an overridden MultiFormatResource.render(),
usually for output=json or render_GET. It returns a Deferred.
:param _MultiFormatResource resource: an HTTP resource to be rendered.
"""
# We should be using twisted.web's DummyRequest here instead of
# nevow's FakeRequest, but right now it is a bit of a problem: see
# web/common.py. MultiFormatResource.render() makes a get_arg()
# call, which does a IRequest(ctx_or_req). IRequest can handle
# FakeRequest, but it can't handle DummyRequest.
req = FakeRequest(**kwargs)
req.fields = None
d = defer.maybeDeferred(resource.render, req)
def _done(res):
if isinstance(res, str):
return res + req.v
return req.v
d.addCallback(_done)
return d
class MyBucketCountingCrawler(BucketCountingCrawler): class MyBucketCountingCrawler(BucketCountingCrawler):
def finished_prefix(self, cycle, prefix): def finished_prefix(self, cycle, prefix):
BucketCountingCrawler.finished_prefix(self, cycle, prefix) BucketCountingCrawler.finished_prefix(self, cycle, prefix)
@ -3291,7 +3315,7 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
self.failIfEqual(sr2["configured-diskbytes"], None) self.failIfEqual(sr2["configured-diskbytes"], None)
self.failIfEqual(sr2["original-sharebytes"], None) self.failIfEqual(sr2["original-sharebytes"], None)
d.addCallback(_after_first_bucket) d.addCallback(_after_first_bucket)
d.addCallback(lambda ign: self.render1(webstatus)) d.addCallback(lambda ign: renderDeferred(webstatus))
def _check_html_in_cycle(html): def _check_html_in_cycle(html):
s = remove_tags(html) s = remove_tags(html)
self.failUnlessIn("So far, this cycle has examined " self.failUnlessIn("So far, this cycle has examined "
@ -3366,7 +3390,7 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
self.failUnlessEqual(count_leases(mutable_si_2), 1) self.failUnlessEqual(count_leases(mutable_si_2), 1)
self.failUnlessEqual(count_leases(mutable_si_3), 2) self.failUnlessEqual(count_leases(mutable_si_3), 2)
d.addCallback(_after_first_cycle) d.addCallback(_after_first_cycle)
d.addCallback(lambda ign: self.render1(webstatus)) d.addCallback(lambda ign: renderDeferred(webstatus))
def _check_html(html): def _check_html(html):
s = remove_tags(html) s = remove_tags(html)
self.failUnlessIn("recovered: 0 shares, 0 buckets " self.failUnlessIn("recovered: 0 shares, 0 buckets "
@ -3466,7 +3490,7 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
d2.addCallback(_after_first_bucket) d2.addCallback(_after_first_bucket)
return d2 return d2
d.addCallback(_after_first_bucket) d.addCallback(_after_first_bucket)
d.addCallback(lambda ign: self.render1(webstatus)) d.addCallback(lambda ign: renderDeferred(webstatus))
def _check_html_in_cycle(html): def _check_html_in_cycle(html):
s = remove_tags(html) s = remove_tags(html)
# the first bucket encountered gets deleted, and its prefix # the first bucket encountered gets deleted, and its prefix
@ -3525,7 +3549,7 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
self.failUnless(rec["configured-diskbytes"] >= 0, self.failUnless(rec["configured-diskbytes"] >= 0,
rec["configured-diskbytes"]) rec["configured-diskbytes"])
d.addCallback(_after_first_cycle) d.addCallback(_after_first_cycle)
d.addCallback(lambda ign: self.render1(webstatus)) d.addCallback(lambda ign: renderDeferred(webstatus))
def _check_html(html): def _check_html(html):
s = remove_tags(html) s = remove_tags(html)
self.failUnlessIn("Expiration Enabled: expired leases will be removed", s) self.failUnlessIn("Expiration Enabled: expired leases will be removed", s)
@ -3610,7 +3634,7 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
d2.addCallback(_after_first_bucket) d2.addCallback(_after_first_bucket)
return d2 return d2
d.addCallback(_after_first_bucket) d.addCallback(_after_first_bucket)
d.addCallback(lambda ign: self.render1(webstatus)) d.addCallback(lambda ign: renderDeferred(webstatus))
def _check_html_in_cycle(html): def _check_html_in_cycle(html):
s = remove_tags(html) s = remove_tags(html)
# the first bucket encountered gets deleted, and its prefix # the first bucket encountered gets deleted, and its prefix
@ -3671,7 +3695,7 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
self.failUnless(rec["configured-diskbytes"] >= 0, self.failUnless(rec["configured-diskbytes"] >= 0,
rec["configured-diskbytes"]) rec["configured-diskbytes"])
d.addCallback(_after_first_cycle) d.addCallback(_after_first_cycle)
d.addCallback(lambda ign: self.render1(webstatus)) d.addCallback(lambda ign: renderDeferred(webstatus))
def _check_html(html): def _check_html(html):
s = remove_tags(html) s = remove_tags(html)
self.failUnlessIn("Expiration Enabled:" self.failUnlessIn("Expiration Enabled:"
@ -3733,7 +3757,7 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
self.failUnlessEqual(count_shares(mutable_si_3), 1) self.failUnlessEqual(count_shares(mutable_si_3), 1)
self.failUnlessEqual(count_leases(mutable_si_3), 2) self.failUnlessEqual(count_leases(mutable_si_3), 2)
d.addCallback(_after_first_cycle) d.addCallback(_after_first_cycle)
d.addCallback(lambda ign: self.render1(webstatus)) d.addCallback(lambda ign: renderDeferred(webstatus))
def _check_html(html): def _check_html(html):
s = remove_tags(html) s = remove_tags(html)
self.failUnlessIn("The following sharetypes will be expired: immutable.", s) self.failUnlessIn("The following sharetypes will be expired: immutable.", s)
@ -3790,7 +3814,7 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
self.failUnlessEqual(count_shares(mutable_si_2), 0) self.failUnlessEqual(count_shares(mutable_si_2), 0)
self.failUnlessEqual(count_shares(mutable_si_3), 0) self.failUnlessEqual(count_shares(mutable_si_3), 0)
d.addCallback(_after_first_cycle) d.addCallback(_after_first_cycle)
d.addCallback(lambda ign: self.render1(webstatus)) d.addCallback(lambda ign: renderDeferred(webstatus))
def _check_html(html): def _check_html(html):
s = remove_tags(html) s = remove_tags(html)
self.failUnlessIn("The following sharetypes will be expired: mutable.", s) self.failUnlessIn("The following sharetypes will be expired: mutable.", s)
@ -4021,7 +4045,7 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
# it also turns all tuples into lists # it also turns all tuples into lists
self.failUnlessEqual(corrupt_shares, [[first_b32, 0]]) self.failUnlessEqual(corrupt_shares, [[first_b32, 0]])
d.addCallback(_check_json) d.addCallback(_check_json)
d.addCallback(lambda ign: self.render1(w)) d.addCallback(lambda ign: renderDeferred(w))
def _check_html(html): def _check_html(html):
s = remove_tags(html) s = remove_tags(html)
self.failUnlessIn("Corrupt shares: SI %s shnum 0" % first_b32, s) self.failUnlessIn("Corrupt shares: SI %s shnum 0" % first_b32, s)
@ -4046,7 +4070,7 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
corrupt_shares = last["corrupt-shares"] corrupt_shares = last["corrupt-shares"]
self.failUnlessEqual(corrupt_shares, [[first_b32, 0]]) self.failUnlessEqual(corrupt_shares, [[first_b32, 0]])
d.addCallback(_check_json_history) d.addCallback(_check_json_history)
d.addCallback(lambda ign: self.render1(w)) d.addCallback(lambda ign: renderDeferred(w))
def _check_html_history(html): def _check_html_history(html):
s = remove_tags(html) s = remove_tags(html)
self.failUnlessIn("Corrupt shares: SI %s shnum 0" % first_b32, s) self.failUnlessIn("Corrupt shares: SI %s shnum 0" % first_b32, s)
@ -4060,7 +4084,7 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
return d return d
def render_json(self, page): def render_json(self, page):
d = self.render1(page, args={"t": ["json"]}) d = renderDeferred(page, args={"t": ["json"]})
return d return d
class WebStatus(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin): class WebStatus(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
@ -4083,7 +4107,7 @@ class WebStatus(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
ss = StorageServer(basedir, nodeid) ss = StorageServer(basedir, nodeid)
ss.setServiceParent(self.s) ss.setServiceParent(self.s)
w = StorageStatus(ss, "nickname") w = StorageStatus(ss, "nickname")
d = self.render1(w) d = renderDeferred(w)
def _check_html(html): def _check_html(html):
self.failUnlessIn("<h1>Storage Server Status</h1>", html) self.failUnlessIn("<h1>Storage Server Status</h1>", html)
s = remove_tags(html) s = remove_tags(html)
@ -4104,7 +4128,7 @@ class WebStatus(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
return d return d
def render_json(self, page): def render_json(self, page):
d = self.render1(page, args={"t": ["json"]}) d = renderDeferred(page, args={"t": ["json"]})
return d return d
def test_status_no_disk_stats(self): def test_status_no_disk_stats(self):