Exclude network resource for {stan, pablogsal}-raspbian (#641)

Author: StanFromIreland

master/custom/factories.py

@@ -77,6 +77,8 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):
         # Adjust the timeout for this worker
         self.test_timeout *= kwargs.get("timeout_factor", 1)
 
+        exclude_test_resources = kwargs.get("exclude_test_resources", [])
+
         # In 3.10, test_asyncio wasn't split out, and refleaks tests
         # need more time.
         if branch == "3.10" and has_option("-R", self.testFlags):
@@ -112,6 +114,19 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):
             testopts.append(parallel)
         if not has_option("-j", testopts):
             testopts.append("-j2")
+        # Add excluded test resources
+        if exclude_test_resources:
+            u_loc = None
+            for i, opt in enumerate(testopts):
+                if opt.startswith("-u"):
+                    u_loc = i
+                    break
+            if u_loc is not None:
+                for resource in exclude_test_resources:
+                    testopts[u_loc] += f",-{resource}"
+            else:
+                testopts.append(f"-uall,{",".join(f"-{r}" for r in exclude_test_resources)}")
+
         test = [
             "make",
             "buildbottest",

master/custom/workers.py

@@ -30,13 +30,15 @@ def __init__(
         not_branches=None,
         parallel_builders=None,
         parallel_tests=None,
+        exclude_test_resources=None,
     ):
         self.name = name
         self.tags = tags or set()
         self.branches = branches
         self.not_branches = not_branches
         self.parallel_builders = parallel_builders
         self.parallel_tests = parallel_tests
+        self.exclude_test_resources = exclude_test_resources
         worker_settings = settings.workers[name]
         owner = name.split("-")[0]
         owner_settings = settings.owners[owner]
@@ -193,7 +195,9 @@ def get_workers(settings):
                   'aarch64', 'arm'],
             parallel_tests=4,
             # Tests fail with latin1 encoding on 3.12, probably earlier
-            not_branches=['3.12', '3.11', '3.10']
+            not_branches=['3.12', '3.11', '3.10'],
+            # Problematic ISP causes issues connecting to testpython.net
+            exclude_test_resources=['network'],
         ),
         cpw(
             name="savannah-raspbian",
@@ -219,6 +223,8 @@ def get_workers(settings):
             name="pablogsal-rasp",
             tags=['linux', 'unix', 'raspbian', 'debian', 'arm'],
             parallel_tests=2,
+            # Problematic ISP causes issues connecting to testpython.net
+            exclude_test_resources=['network'],
         ),
         cpw(
             name="skumaran-ubuntu-x86_64",

master/master.cfg

@@ -165,6 +165,13 @@ extra_factory_args = {
 
 }
 
+# Build factory args from worker properties
+for w in WORKERS:
+    if w.exclude_test_resources:
+        if w.name not in extra_factory_args:
+            extra_factory_args[w.name] = {}
+        extra_factory_args[w.name]["exclude_test_resources"] = w.exclude_test_resources
+
 # The following with the worker owners' agreement
 cpulock = locks.WorkerLock(
     "cpu",