test: pre-populate scheduling_users in Cyrus and Baikal server classes

Rather than requiring a caldav_test_servers.yaml file to be written
by CI (or manually by the user), bake the scheduling_users directly
into CyrusTestServer and BaikalTestServer.__init__.

- Cyrus: user1-user3 / password 'x' (pre-created by the docker image)
- Baikal: user1-user3 / testpass1-3 (pre-seeded in the committed db.sqlite)

The per-server TestSchedulingForServer{Cyrus,Baikal} classes are now
generated automatically whenever those servers are running, with no
additional configuration required.

Also drop the now-unnecessary CI step that wrote caldav_test_servers.yaml.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: tobixen

.github/workflows/tests.yaml

@@ -276,36 +276,6 @@ jobs:
             echo "✗ Error: Bedework CalDAV access failed"
             exit 1
           fi
-      - name: Configure RFC6638 scheduling test users
-        run: |
-          # Write test config with scheduling_users for each server that supports it.
-          # Cyrus pre-creates user1-user5 (password 'x') with scheduling support.
-          # Baikal users user1-user3 are in the pre-seeded db.sqlite.
-          # These configs are merged into auto-discovered servers by the registry.
-          cat > tests/caldav_test_servers.yaml << 'EOF'
-          cyrus:
-            scheduling_users:
-              - url: http://localhost:8802/dav/calendars/user/user1
-                username: user1
-                password: x
-              - url: http://localhost:8802/dav/calendars/user/user2
-                username: user2
-                password: x
-              - url: http://localhost:8802/dav/calendars/user/user3
-                username: user3
-                password: x
-          baikal:
-            scheduling_users:
-              - url: http://localhost:8800/dav.php/
-                username: user1
-                password: testpass1
-              - url: http://localhost:8800/dav.php/
-                username: user2
-                password: testpass2
-              - url: http://localhost:8800/dav.php/
-                username: user3
-                password: testpass3
-          EOF
       - run: tox -e py
         env:
           NEXTCLOUD_URL: http://localhost:8801

tests/test_servers/docker.py

@@ -30,13 +30,22 @@ class BaikalTestServer(DockerTestServer):
 
     def __init__(self, config: dict[str, Any] | None = None) -> None:
         config = config or {}
-        config.setdefault("host", os.environ.get("BAIKAL_HOST", "localhost"))
-        config.setdefault("port", int(os.environ.get("BAIKAL_PORT", "8800")))
+        host = config.get("host") or os.environ.get("BAIKAL_HOST", "localhost")
+        port = int(config.get("port") or os.environ.get("BAIKAL_PORT", "8800"))
+        config.setdefault("host", host)
+        config.setdefault("port", port)
         config.setdefault("username", os.environ.get("BAIKAL_USERNAME", "testuser"))
         config.setdefault("password", os.environ.get("BAIKAL_PASSWORD", "testpass"))
         # Set up Baikal-specific compatibility hints
         if "features" not in config:
             config["features"] = compatibility_hints.baikal.copy()
+        # user1-user3 are pre-seeded in the committed db.sqlite for scheduling tests
+        if "scheduling_users" not in config:
+            base = f"http://{host}:{port}/dav.php"
+            config["scheduling_users"] = [
+                {"url": base, "username": f"user{i}", "password": f"testpass{i}"}
+                for i in range(1, 4)
+            ]
         super().__init__(config)
 
     def _default_port(self) -> int:
@@ -88,21 +97,35 @@ class CyrusTestServer(DockerTestServer):
     Cyrus IMAP server with CalDAV support in Docker.
 
     Cyrus is a mail server that also supports CalDAV/CardDAV.
+    The ghcr.io/cyrusimap/cyrus-docker-test-server image pre-creates
+    user1-user5 (password 'x') with CalDAV scheduling support.
     """
 
     name = "Cyrus"
 
     def __init__(self, config: dict[str, Any] | None = None) -> None:
         config = config or {}
-        config.setdefault("host", os.environ.get("CYRUS_HOST", "localhost"))
-        config.setdefault("port", int(os.environ.get("CYRUS_PORT", "8802")))
+        host = config.get("host") or os.environ.get("CYRUS_HOST", "localhost")
+        port = int(config.get("port") or os.environ.get("CYRUS_PORT", "8802"))
+        config.setdefault("host", host)
+        config.setdefault("port", port)
         config.setdefault("username", os.environ.get("CYRUS_USERNAME", "user1"))
         config.setdefault(
             "password", os.environ.get("CYRUS_PASSWORD", "any-password-seems-to-work")
         )
         # Set up Cyrus-specific compatibility hints
         if "features" not in config:
             config["features"] = compatibility_hints.cyrus.copy()
+        # The docker image pre-creates user1-user5 with password 'x'
+        if "scheduling_users" not in config:
+            config["scheduling_users"] = [
+                {
+                    "url": f"http://{host}:{port}/dav/calendars/user/user{i}",
+                    "username": f"user{i}",
+                    "password": "x",
+                }
+                for i in range(1, 4)
+            ]
         super().__init__(config)
 
     def _default_port(self) -> int: