ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-19 11:16:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixups after rebase

Browse Source
This commit is contained in:
meejah 2018-08-25 01:07:26 -06:00
parent c22d7c632e
commit 2d55b61dd2
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -535,6 +535,7 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
s.setServiceParent(self.sparent) s.setServiceParent(self.sparent)
return s return s
# @inlineCallbacks
def _create_introducer(self): def _create_introducer(self):
""" """
:returns: (via Deferred) an Introducer instance :returns: (via Deferred) an Introducer instance
@ -557,14 +558,7 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
f = open(os.path.join(iv_dir, "private", "node.pem"), "w") f = open(os.path.join(iv_dir, "private", "node.pem"), "w")
f.write(SYSTEM_TEST_CERTS[0]) f.write(SYSTEM_TEST_CERTS[0])
f.close() f.close()
self.introducer = yield create_introducer(basedir=iv_dir) return create_introducer(basedir=iv_dir)
self.introducer.setServiceParent(self.sparent)
self._get_introducer_web()
if use_stats_gatherer:
yield self._set_up_stats_gatherer(None)
yield self._set_up_nodes_2(None)
if use_stats_gatherer:
yield self._grab_stats(None)
def _get_introducer_web(self): def _get_introducer_web(self):
with open(os.path.join(self.getdir("introducer"), "node.url"), "r") as f: with open(os.path.join(self.getdir("introducer"), "node.url"), "r") as f:
@ -592,7 +586,8 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
""" """
self.numclients = NUMCLIENTS self.numclients = NUMCLIENTS
self.introducer = self.add_service(self._create_introducer()) self.introducer = yield self._create_introducer()
self.add_service(self.introducer)
self.introweb_url = self._get_introducer_web() self.introweb_url = self._get_introducer_web()
if use_stats_gatherer: if use_stats_gatherer: