test: fix RFC6638 scheduling test collection and server config merging

- Rename TestSchedulingBase → _TestSchedulingBase so pytest no longer
  collects the base class directly (it has _users=[] → noisy skip).
  The docstring already said "no Test prefix" but the code disagreed.

- Teach load_from_config to merge scheduling_users into an already-
  registered server (case-insensitive name match) instead of
  registering a duplicate.  This allows a caldav_test_servers.yaml
  entry like:
    cyrus:
      scheduling_users: [...]
  to augment the auto-discovered CyrusTestServer without doubling up.

- If a config entry contains only test-metadata keys (scheduling_users,
  type, enabled) and no matching server is already registered, skip it
  silently — it is intended to augment a running server, not create a
  new one (avoids spurious test runs when e.g. Cyrus isn't started
  locally but the CI-oriented config file is present).

- Update CI step to write per-server scheduling_users for both Cyrus
  and Baikal (instead of the previous global rfc6638_users approach).

- Update caldav_test_servers.yaml.example with Baikal and SOGo
  scheduling_users examples and explain when to use the legacy
  rfc6638_users fallback.

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

Author: tobixen

.github/workflows/tests.yaml

@@ -278,23 +278,33 @@ jobs:
           fi
       - name: Configure RFC6638 scheduling test users
         run: |
-          # Write test config with rfc6638_users for scheduling tests.
+          # 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.
-          # Two separate config sections for each server; CI uses Cyrus.
+          # These configs are merged into auto-discovered servers by the registry.
           cat > tests/caldav_test_servers.yaml << 'EOF'
-          # RFC6638 scheduling test users - written by CI
-          # Cyrus pre-creates user1-user5 with password 'x' and supports scheduling
-          rfc6638_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
+          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:

tests/caldav_test_servers.yaml.example

@@ -161,11 +161,42 @@ test-servers:
 # RFC6638 scheduling test users (optional)
 # =========================================================================
 #
-# For testing calendar scheduling (meeting invites, etc.), define at least
-# three users on the same CalDAV server that can send invites to each other.
-# This section lives at the TOP LEVEL (not under test-servers).
+# Preferred: add scheduling_users inside a server block (as shown for Cyrus
+# above).  The registry merges it into the already-registered server, and
+# pytest generates a TestSchedulingForServer<Name> class automatically.
+#
+# Baikal (user1-user3 in pre-seeded db.sqlite, passwords testpass1-3):
+#
+#   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
+#
+# SOGo (user1-user3 from init-sogo-users.sql, passwords testpass1-3):
+#
+#   sogo:
+#     scheduling_users:
+#       - url: http://localhost:8803/SOGo/dav/user1
+#         username: user1
+#         password: testpass1
+#       - url: http://localhost:8803/SOGo/dav/user2
+#         username: user2
+#         password: testpass2
+#       - url: http://localhost:8803/SOGo/dav/user3
+#         username: user3
+#         password: testpass3
+#
+# Legacy: top-level rfc6638_users creates a single TestScheduling class
+# that is not tied to any specific server in the test run.  Prefer the
+# per-server scheduling_users approach above.
 #
-# Cyrus (pre-creates user1-user5 with password 'x'):
 # rfc6638_users:
 #   - url: http://localhost:8802/dav/calendars/user/user1
 #     username: user1
@@ -176,27 +207,3 @@ test-servers:
 #   - url: http://localhost:8802/dav/calendars/user/user3
 #     username: user3
 #     password: x
-#
-# Baikal (user1-user3 are in the pre-seeded db.sqlite, passwords testpass1-3):
-# rfc6638_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
-#
-# SOGo (user1-user3 from init-sogo-users.sql, passwords testpass1-3):
-# rfc6638_users:
-#   - url: http://localhost:8803/SOGo/dav/user1
-#     username: user1
-#     password: testpass1
-#   - url: http://localhost:8803/SOGo/dav/user2
-#     username: user2
-#     password: testpass2
-#   - url: http://localhost:8803/SOGo/dav/user3
-#     username: user3
-#     password: testpass3

tests/test_caldav.py

@@ -670,7 +670,7 @@ def test_multi_server_meta_section(self) -> None:
                     assert len(clients) == 2
 
 
-class TestSchedulingBase:
+class _TestSchedulingBase:
     """
     Base class for RFC6638 scheduling tests.  Not collected directly by
     pytest (no ``Test`` prefix); concrete subclasses supply ``_users``.
@@ -793,7 +793,7 @@ def testInviteAndRespond(self):
 if rfc6638_users:
     TestScheduling = type(
         "TestScheduling",
-        (TestSchedulingBase,),
+        (_TestSchedulingBase,),
         {"_users": rfc6638_users},
     )
 
@@ -3689,6 +3689,6 @@ def testWithEnvironment(self):
         _sched_classname = "TestSchedulingForServer" + _servername
         vars()[_sched_classname] = type(
             _sched_classname,
-            (TestSchedulingBase,),
+            (_TestSchedulingBase,),
             {"_users": _caldav_server["scheduling_users"]},
         )

tests/test_servers/registry.py

@@ -189,6 +189,32 @@ def load_from_config(self, config: dict) -> None:
             if not server_config.get("enabled", True):
                 continue
 
+            # Keys that only carry test-specific metadata, not connection config.
+            _TEST_ONLY_KEYS = frozenset({"scheduling_users"})
+            _META_KEYS = frozenset({"type", "enabled", "name"})
+
+            # If an auto-discovered server with the same name (case-insensitive) is
+            # already registered, merge extra test-only fields (like scheduling_users)
+            # into it instead of registering a duplicate.
+            existing_key = next(
+                (k for k in self._servers if k.lower() == name.lower()), None
+            )
+            if existing_key is not None:
+                if "scheduling_users" in server_config:
+                    self._servers[existing_key].config["scheduling_users"] = server_config[
+                        "scheduling_users"
+                    ]
+                continue
+
+            # If the config only contains test-only metadata (no real connection
+            # params) and there is no existing server to merge into, skip: the
+            # entry is intended only to augment a running server, not to register
+            # a new one (e.g. a config written for CI that references Cyrus
+            # scheduling users but Cyrus isn't started locally).
+            non_connection_keys = {k for k in server_config if k not in _META_KEYS | _TEST_ONLY_KEYS}
+            if not non_connection_keys:
+                continue
+
             server_type = server_config.get("type", name)
             server_class = get_server_class(server_type)