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

Refactor so that test_util pass

Browse Source
This commit is contained in:
Sajith Sasidharan 2020-02-11 05:17:35 -05:00
parent c88c97aad5
commit c7a63f957d
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,8 @@ 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 allmydata.test.no_network import NoNetworkServer from allmydata.test.no_network import NoNetworkServer
from allmydata.web.storage import StorageStatus, remove_prefix from allmydata.web.storage import StorageStatus, StorageStatusElement, \
remove_prefix
from allmydata.storage_client import ( from allmydata.storage_client import (
_StorageServer, _StorageServer,
) )
@ -4208,7 +4209,7 @@ class WebStatus(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
self.failUnlessIn("Reserved space: - 10.00 MB (10000000)", s) self.failUnlessIn("Reserved space: - 10.00 MB (10000000)", s)
def test_util(self): def test_util(self):
w = StorageStatus(None) w = StorageStatusElement(None, None)
self.failUnlessEqual(w.render_space(None, None), "?") self.failUnlessEqual(w.render_space(None, None), "?")
self.failUnlessEqual(w.render_space(None, 10e6), "10000000") self.failUnlessEqual(w.render_space(None, 10e6), "10000000")
self.failUnlessEqual(w.render_abbrev_space(None, None), "?") self.failUnlessEqual(w.render_abbrev_space(None, None), "?")

10
src/allmydata/web/storage.py
View File

@ -50,6 +50,16 @@ class StorageStatusElement(Element):
return tag("?") return tag("?")
return tag(abbreviate_space(val)) return tag(abbreviate_space(val))
def render_abbrev_space(self, ctx, size):
if size is None:
return "?"
return abbreviate_space(size)
def render_space(self, ctx, size):
if size is None:
return "?"
return "%d" % size
@renderer @renderer
def disk_total(self, req, tag): def disk_total(self, req, tag):
return self.str(tag, self.get_stat("storage_server.disk_total")) return self.str(tag, self.get_stat("storage_server.disk_total"))