X-Git-Url: https://git.rkrishnan.org/?a=blobdiff_plain;f=src%2Fallmydata%2Ftest%2Ftest_web.py;h=576c3da33c8bfbf238b788f659f0c00e2931a27e;hb=a5895b9d59212ab1a000b6e1d099cad4fe630c4d;hp=2c6c0ceb4c998a144ff9cb60e7c9e45ba13fcd89;hpb=eba64f2abaa6e7d0e155026129efefa77c25931f;p=tahoe-lafs%2Ftahoe-lafs.git
diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index 2c6c0ceb..576c3da3 100644
--- a/src/allmydata/test/test_web.py
+++ b/src/allmydata/test/test_web.py
@@ -80,6 +80,9 @@ class FakeNodeMaker(NodeMaker):
class FakeUploader(service.Service):
name = "uploader"
+ helper_furl = None
+ helper_connected = False
+
def upload(self, uploadable):
d = uploadable.get_size()
d.addCallback(lambda size: uploadable.read(size))
@@ -100,8 +103,10 @@ class FakeUploader(service.Service):
return ur
d.addCallback(_got_data)
return d
+
def get_helper_info(self):
- return (None, False)
+ return (self.helper_furl, self.helper_connected)
+
def build_one_ds():
ds = DownloadStatus("storage_index", 1234)
@@ -609,6 +614,36 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
d.addCallback(_check)
return d
+ def test_helper_status(self):
+ d = defer.succeed(None)
+
+ # set helper furl to None
+ def _set_helper_not_configured2(ign):
+ self.s.uploader.helper_furl = None
+ return self.GET("/")
+ d.addCallback(_set_helper_not_configured2)
+ d.addCallback(lambda res:
+ self.failUnlessIn('Connected to helper?: not configured', res))
+
+ # enable helper, not connected
+ def _set_helper_not_connected(ign):
+ self.s.uploader.helper_furl = "pb://someHelper"
+ self.s.uploader.helper_connected = False
+ return self.GET("/")
+ d.addCallback(_set_helper_not_connected)
+ d.addCallback(lambda res:
+ self.failUnlessIn('Connected to helper?: no', res))
+
+ # enable helper, connected
+ def _set_helper_connected(ign):
+ self.s.uploader.helper_furl = "pb://someHelper"
+ self.s.uploader.helper_connected = True
+ return self.GET("/")
+ d.addCallback(_set_helper_connected)
+ d.addCallback(lambda res:
+ self.failUnlessIn('Connected to helper?: yes', res))
+ return d
+
def test_storage(self):
d = self.GET("/storage")
def _check(res):