ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-27 08:22:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rearrange nodes so it's possible to create even fewer.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2023-05-02 12:11:23 -04:00
parent 8fa89bd985
commit d4f2038fd1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/allmydata/test/common_system.py
View File

@ -819,8 +819,8 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
helper_furl = f.read() helper_furl = f.read()
self.helper_furl = helper_furl self.helper_furl = helper_furl
if self.numclients >= 4: if self.numclients >= 2:
with open(os.path.join(basedirs[3], 'tahoe.cfg'), 'a+') as f: with open(os.path.join(basedirs[1], 'tahoe.cfg'), 'a+') as f:
f.write( f.write(
"[client]\n" "[client]\n"
"helper.furl = {}\n".format(helper_furl) "helper.furl = {}\n".format(helper_furl)
@ -836,9 +836,9 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
log.msg("CONNECTED") log.msg("CONNECTED")
# now find out where the web port was # now find out where the web port was
self.webish_url = self.clients[0].getServiceNamed("webish").getURL() self.webish_url = self.clients[0].getServiceNamed("webish").getURL()
if self.numclients >=4: if self.numclients >=2:
# and the helper-using webport # and the helper-using webport
self.helper_webish_url = self.clients[3].getServiceNamed("webish").getURL() self.helper_webish_url = self.clients[1].getServiceNamed("webish").getURL()
def _generate_config(self, which, basedir, force_foolscap=False): def _generate_config(self, which, basedir, force_foolscap=False):
config = {} config = {}
@ -854,10 +854,10 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
("node", "tub.location"): allclients, ("node", "tub.location"): allclients,
# client 0 runs a webserver and a helper # client 0 runs a webserver and a helper
# client 3 runs a webserver but no helper # client 1 runs a webserver but no helper
("node", "web.port"): {0, 3}, ("node", "web.port"): {0, 1},
("node", "timeout.keepalive"): {0}, ("node", "timeout.keepalive"): {0},
("node", "timeout.disconnect"): {3}, ("node", "timeout.disconnect"): {1},
("helper", "enabled"): {0}, ("helper", "enabled"): {0},
} }