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

webish: fix 'not running helper' status indicator on welcome page, add tests

Browse Source
This commit is contained in:
Brian Warner 2008-04-14 16:28:11 -07:00
parent 5b8320442a
commit 86578bc3cd
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/test/test_system.py
View File

@ -1198,6 +1198,7 @@ class SystemTest(testutil.SignalMixin, testutil.PollMixin, unittest.TestCase):
self.failUnless(expected in page,
"I didn't see the right 'My nodeid' message "
"in: %s" % page)
self.failUnless("Helper: 0 active uploads" in page)
d.addCallback(_got_welcome)
d.addCallback(self.log, "done with _got_welcome")
@ -1206,6 +1207,7 @@ class SystemTest(testutil.SignalMixin, testutil.PollMixin, unittest.TestCase):
def _got_welcome_helper(page):
self.failUnless("Connected to helper?: <span>yes</span>" in page,
page)
self.failUnless("Not running helper" in page)
d.addCallback(_got_welcome_helper)
d.addCallback(lambda res: getPage(base + public))

2
src/allmydata/webish.py
View File

@ -1472,7 +1472,7 @@ class Root(rend.Page):
try:
h = client.getServiceNamed("helper")
stats = h.get_stats()
active_uploads = stats["helper"]["CHK_active_uploads"]
active_uploads = stats["chk_upload_helper.active_uploads"]
ul[T.li["Helper: %d active uploads" % (active_uploads,)]]
except KeyError:
ul[T.li["Not running helper"]]