From 696a260ddfc02be35a63ed1446eda0b5434cc86f Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 29 Oct 2021 09:00:38 -0400 Subject: [PATCH 1/2] news fragment --- newsfragments/3836.minor | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newsfragments/3836.minor diff --git a/newsfragments/3836.minor b/newsfragments/3836.minor new file mode 100644 index 000000000..e69de29bb From 892b4683654cd1281be8feeaa65a2ef946ed4f5a Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 29 Oct 2021 09:03:37 -0400 Subject: [PATCH 2/2] use the port assigner to assign a port for the main tub --- src/allmydata/test/common_system.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/allmydata/test/common_system.py b/src/allmydata/test/common_system.py index 9d14c8642..874c7f6ba 100644 --- a/src/allmydata/test/common_system.py +++ b/src/allmydata/test/common_system.py @@ -672,11 +672,14 @@ class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin): """ iv_dir = self.getdir("introducer") if not os.path.isdir(iv_dir): - _, port_endpoint = self.port_assigner.assign(reactor) + _, web_port_endpoint = self.port_assigner.assign(reactor) + main_location_hint, main_port_endpoint = self.port_assigner.assign(reactor) introducer_config = ( u"[node]\n" u"nickname = introducer \N{BLACK SMILING FACE}\n" + - u"web.port = {}\n".format(port_endpoint) + u"web.port = {}\n".format(web_port_endpoint) + + u"tub.port = {}\n".format(main_port_endpoint) + + u"tub.location = {}\n".format(main_location_hint) ).encode("utf-8") fileutil.make_dirs(iv_dir)