mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-01-24 21:36:47 +00:00
Document, use, and test "join pathstring" method
This commit is contained in:
parent
589e143a4a
commit
6969366370
@ -118,7 +118,7 @@ class FakeDeepCheckResults(object):
|
||||
return {
|
||||
# TODO: fill this, perhaps with one each of healthy,
|
||||
# unhealthy, unrecoverable, corrupt.
|
||||
"fake-result-path": FakeResults()
|
||||
(u"some", u"fake", u"path"): FakeResults()
|
||||
}
|
||||
|
||||
def get_corrupt_shares(self):
|
||||
@ -473,6 +473,11 @@ class WebResultsRendering(unittest.TestCase):
|
||||
u"Files/Directories That Had Problems:"
|
||||
)
|
||||
|
||||
assert_soup_has_tag_with_content(
|
||||
self, soup, u"li",
|
||||
u"some/fake/path: fake summary results [SI: mzqwwzjnonuq]"
|
||||
)
|
||||
|
||||
assert_soup_has_tag_with_content(
|
||||
self, soup, u"h2",
|
||||
u"Servers on which corrupt shares were found"
|
||||
|
@ -91,6 +91,13 @@ class ResultsBase(object):
|
||||
# determine the permuted peer order
|
||||
|
||||
def _join_pathstring(self, path):
|
||||
"""
|
||||
:param tuple path: a path represented by a tuple, such as
|
||||
``(u'some', u'dir', u'file')``.
|
||||
|
||||
:return: a string joined by path separaters, such as
|
||||
``u'some/dir/file'``.
|
||||
"""
|
||||
if path:
|
||||
pathstring = "/".join(self._html(path))
|
||||
else:
|
||||
@ -504,7 +511,7 @@ class DeepCheckResultsRendererElement(Element, ResultsBase, ReloadMixin):
|
||||
problems.append({
|
||||
# Not sure self._join_pathstring(path) is the
|
||||
# right thing to use here.
|
||||
"problem": self._html(path) + self._html(summary_text),
|
||||
"problem": self._join_pathstring(path) + self._html(summary_text),
|
||||
})
|
||||
|
||||
return SlotsSequenceElement(tag, problems)
|
||||
@ -573,7 +580,7 @@ class DeepCheckResultsRendererElement(Element, ResultsBase, ReloadMixin):
|
||||
result = results.get(path)
|
||||
storage_index = result.get_storage_index()
|
||||
object = {
|
||||
"path": self._html(path),
|
||||
"path": self._join_pathstring(path),
|
||||
"healthy": str(result.is_healthy()),
|
||||
"recoverable": str(result.is_recoverable()),
|
||||
"storage_index": self._render_si_link(req, storage_index),
|
||||
|
Loading…
Reference in New Issue
Block a user