Merge remote-tracking branch 'origin/master' into 4016-http-storage-content-type

.github/workflows/ci.yml

@@ -169,12 +169,12 @@ jobs:
             python-version: "3.9"
             force-foolscap: false
           - os: windows-latest
-            python-version: "3.9"
+            python-version: "3.11"
             force-foolscap: false
           # 22.04 has some issue with Tor at the moment:
           # https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3943
           - os: ubuntu-20.04
-            python-version: "3.11"
+            python-version: "3.10"
             force-foolscap: false
     steps:
 

integration/conftest.py

@@ -50,9 +50,9 @@ from .util import (
 )
 from allmydata.node import read_config
 
-# No reason for HTTP requests to take longer than two minutes in the
+# No reason for HTTP requests to take longer than four minutes in the
 # integration tests. See allmydata/scripts/common_http.py for usage.
-os.environ["__TAHOE_CLI_HTTP_TIMEOUT"] = "120"
+os.environ["__TAHOE_CLI_HTTP_TIMEOUT"] = "240"
 
 # Make Foolscap logging go into Twisted logging, so that integration test logs
 # include extra information

setup.py

@@ -418,7 +418,7 @@ setup(name="tahoe-lafs", # also set in __init__.py
               "subunitreporter==22.2.0",
               "python-subunit==1.4.2",
               "junitxml==0.7",
-              "coverage ~= 5.0",
+              "coverage==7.2.5",
           ],
 
           # Here are the library dependencies of the test suite.

src/allmydata/test/common_system.py

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

src/allmydata/test/test_system.py

@@ -782,7 +782,7 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase):
 
     def test_filesystem(self):
         self.data = LARGE_DATA
-        d = self.set_up_nodes()
+        d = self.set_up_nodes(2)
         def _new_happy_semantics(ign):
             for c in self.clients:
                 c.encoding_params['happy'] = 1
@@ -1746,6 +1746,10 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase):
 
         return d
 
+    # In CI this test can be very slow, so give it a longer timeout:
+    test_filesystem.timeout = 360  # type: ignore[attr-defined]
+
+
     def test_filesystem_with_cli_in_subprocess(self):
         # We do this in a separate test so that test_filesystem doesn't skip if we can't run bin/tahoe.