Put extra_factory_args in a flat namespace for definition

Author: encukou

master/custom/workers.py

@@ -30,15 +30,24 @@ def __init__(
         not_branches=None,
         parallel_builders=None,
         parallel_tests=None,
-        extra_factory_args=None,
+        timeout_factor=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.extra_factory_args = extra_factory_args or {}
+
+        # Forward some args to build factories
+        _xf_args = {}
+        self.extra_factory_args = _xf_args
+        if timeout_factor is not None:
+            _xf_args['timeout_factor'] = timeout_factor
+        if exclude_test_resources is not None:
+            _xf_args['exclude_test_resources'] = exclude_test_resources
+
         worker_settings = settings.workers[name]
         owner = name.split("-")[0]
         owner_settings = settings.owners[owner]
@@ -124,10 +133,7 @@ def get_workers(settings):
             tags=['linux', 'unix', 'rhel', 'ppc64le'],
             parallel_tests=10,
             branches=['3.10', '3.11', '3.12'],
-            extra_factory_args={
-                # Increase the timeout on this slow worker
-                "timeout_factor": 2,
-            },
+            timeout_factor=2,  # Increase the timeout on this slow worker
         ),
         cpw(
             name="cstratak-CentOS9-ppc64le",
@@ -203,9 +209,7 @@ def get_workers(settings):
             # Tests fail with latin1 encoding on 3.12, probably earlier
             not_branches=['3.12', '3.11', '3.10'],
             # Problematic ISP causes issues connecting to testpython.net
-            extra_factory_args=dict(
-                exclude_test_resources=['urlfetch', 'network'],
-            ),
+            exclude_test_resources=['urlfetch', 'network'],
         ),
         cpw(
             name="savannah-raspbian",
@@ -222,27 +226,21 @@ def get_workers(settings):
             name="pablogsal-arch-x86_64",
             tags=['linux', 'unix', 'arch', 'amd64', 'x86-64'],
             # Problematic ISP causes issues connecting to testpython.net
-            extra_factory_args=dict(
-                exclude_test_resources=['urlfetch', 'network'],
-            ),
+            exclude_test_resources=['urlfetch', 'network'],
         ),
         cpw(
             name="pablogsal-macos-m1",
             tags=['macOS', 'unix', 'arm', 'arm64'],
             parallel_tests=4,
             # Problematic ISP causes issues connecting to testpython.net
-            extra_factory_args=dict(
-                exclude_test_resources=['urlfetch', 'network'],
-            ),
+            exclude_test_resources=['urlfetch', 'network'],
         ),
         cpw(
             name="pablogsal-rasp",
             tags=['linux', 'unix', 'raspbian', 'debian', 'arm'],
             parallel_tests=1,  # Reduced from 2: ASAN builds use 2-10x more memory
             # Problematic ISP causes issues connecting to testpython.net
-            extra_factory_args=dict(
-                exclude_test_resources=['urlfetch', 'network'],
-            ),
+            exclude_test_resources=['urlfetch', 'network'],
         ),
         cpw(
             name="skumaran-ubuntu-x86_64",
@@ -295,10 +293,7 @@ def get_workers(settings):
             not_branches=['3.10'],
             parallel_tests=2,
             parallel_builders=2,
-            extra_factory_args={
-                # Increase the timeout on this slow worker
-                "timeout_factor": 2,
-            },
+            timeout_factor=2,  # Increase the timeout on this slow worker
         ),
         cpw(
             name="ambv-bb-win11",