Changeset e8ed711 in trunk

Timestamp:

2021-11-03T16:25:38Z (4 years ago)

Author:

Jean-Paul Calderone <exarkun@…>

Branches:

master

Children:

8fbbc91

Parents:

39c4a2c (diff), 5bfe6d5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into 3833.container-format-abstraction

Files:

• integration/test_tor.py (modified) (1 diff)
• newsfragments/3836.minor (added)
• newsfragments/3837.other (added)
• src/allmydata/test/common_system.py (modified) (1 diff)

integration/test_tor.py ¶

@@ -35 +35 @@
 if sys.platform.startswith('win'):
     pytest.skip('Skipping Tor tests on Windows', allow_module_level=True)
+
+if PY2:
+    pytest.skip('Skipping Tor tests on Python 2 because dependencies are hard to come by', allow_module_level=True)
 
 @pytest_twisted.inlineCallbacks

src/allmydata/test/common_system.py ¶

@@ -673 +673 @@
         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")