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

test_system.py: wait for the Helper connection properly before uploading

Browse Source
This commit is contained in:
Brian Warner 2012-06-11 23:19:30 -07:00
parent 5e432b12a1
commit 51a5aaa639
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,6 +213,12 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase):
self.extra_node.DEFAULT_ENCODING_PARAMETERS['happy'] = 5
d.addCallback(_added)
def _has_helper():
uploader = self.extra_node.getServiceNamed("uploader")
furl, connected = uploader.get_helper_info()
return connected
d.addCallback(lambda ign: self.poll(_has_helper))
HELPER_DATA = "Data that needs help to upload" * 1000
def _upload_with_helper(res):
u = upload.Data(HELPER_DATA, convergence=convergence)
@ -304,11 +310,12 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase):
self.failIf(os.path.exists(incdir) and os.listdir(incdir))
d.addCallback(_disconnected)
# then we need to give the reconnector a chance to
# reestablish the connection to the helper.
d.addCallback(lambda res:
log.msg("wait_for_connections", level=log.NOISY,
log.msg("wait_for_helper", level=log.NOISY,
facility="tahoe.test.test_system"))
# then we need to wait for the extra node to reestablish its
# connection to the helper.
d.addCallback(lambda ign: self.poll(_has_helper))
d.addCallback(lambda res:
log.msg("uploading again", level=log.NOISY,