feat: add scheduling.mailbox and scheduling.calendar-user-address-set sub-features

- Add scheduling.mailbox and scheduling.calendar-user-address-set to
  FeatureSet.FEATURES (RFC6638 sections 2.2-2.4.1)
- Set both to unsupported in the gmx server entry (scheduling is
  advertised but sub-features are non-functional)
- Adapt testSchedulingInfo/testSchedulingMailboxes to use the new
  sub-feature flags instead of the top-level scheduling flag
- Refactor TestScheduling into TestSchedulingBase with a configurable
  _users list; legacy TestScheduling created from rfc6638_users
- Generate TestSchedulingForServer* classes for servers with
  scheduling_users configured in their server entry
- Pass scheduling_users through in TestServer.get_server_params()
- Document and enable scheduling_users for Cyrus in the example config
  (Cyrus pre-creates user1-user5 with password 'x')

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

Author: tobixen

caldav/compatibility_hints.py

@@ -262,9 +262,17 @@ class FeatureSet:
             "description": "Server correctly handles sync-collection reports after objects have been deleted from the calendar (solved in Nextcloud in https://github.com/nextcloud/server/pull/44130)"
         },
         "scheduling": {
-            "description": "Server supports CalDAV Scheduling (RFC6638). Detected via the presence of the schedule-outbox and/or schedule-inbox in DAV headers. Corresponds to the legacy 'no_scheduling' flag.",
+            "description": "Server supports CalDAV Scheduling (RFC6638). Detected via the presence of 'calendar-auto-schedule' in the DAV response header.",
             "links": ["https://datatracker.ietf.org/doc/html/rfc6638"],
         },
+        "scheduling.mailbox": {
+            "description": "Server provides schedule-inbox and schedule-outbox collections for the principal (RFC6638 sections 2.2-2.3). When unsupported, calls to schedule_inbox() or schedule_outbox() raise NotFoundError.",
+            "links": ["https://datatracker.ietf.org/doc/html/rfc6638#section-2.2"],
+        },
+        "scheduling.calendar-user-address-set": {
+            "description": "Server provides the calendar-user-address-set property on the principal (RFC6638 section 2.4.1), used to identify a user's email/URI for scheduling purposes. When unsupported, calendar_user_address_set() raises NotFoundError.",
+            "links": ["https://datatracker.ietf.org/doc/html/rfc6638#section-2.4.1"],
+        },
         'freebusy-query': {'description': "freebusy queries come in two flavors, one query can be done towards a CalDAV server as defined in RFC4791, another query can be done through the scheduling framework, RFC 6638.  Only RFC4791 is tested for as today"},
         "freebusy-query.rfc4791": {
             "description": "Server supports free/busy-query REPORT as specified in RFC4791 section 7.10. The REPORT allows clients to query for free/busy time information for a time range. Servers without this support will typically return an error (often 500 Internal Server Error or 501 Not Implemented). Note: RFC6638 defines a different freebusy mechanism for scheduling",
@@ -1440,8 +1448,9 @@ def dotted_feature_set_list(self, compact=False):
     #'search.time-range.alarm': {'support': 'unsupported'},
     ## GMX advertises calendar-auto-schedule but inbox/mailbox and
     ## calendar-user-address-set are not functional (RFC6638 sub-features).
-    ## TODO: add scheduling.mailbox and scheduling.calendar-user-address-set sub-features
     "scheduling": {"support": "full"},
+    "scheduling.mailbox": {"support": "unsupported"},
+    "scheduling.calendar-user-address-set": {"support": "unsupported"},
     "old_flags":  [
         #"text_search_is_case_insensitive",
         "no_search_openended",

tests/caldav_test_servers.yaml.example

@@ -60,6 +60,17 @@ test-servers:
     port: ${CYRUS_PORT:-8802}
     username: ${CYRUS_USERNAME:-testuser@test.local}
     password: ${CYRUS_PASSWORD:-testpassword}
+    # Cyrus pre-creates user1-user5 (password 'x'), enabling scheduling tests.
+    scheduling_users:
+      - url: http://${CYRUS_HOST:-localhost}:${CYRUS_PORT:-8802}/dav/calendars/user/user1
+        username: user1@test.local
+        password: x
+      - url: http://${CYRUS_HOST:-localhost}:${CYRUS_PORT:-8802}/dav/calendars/user/user2
+        username: user2@test.local
+        password: x
+      - url: http://${CYRUS_HOST:-localhost}:${CYRUS_PORT:-8802}/dav/calendars/user/user3
+        username: user3@test.local
+        password: x
 
   sogo:
     type: docker

tests/test_caldav.py

@@ -670,15 +670,11 @@ def test_multi_server_meta_section(self) -> None:
                     assert len(clients) == 2
 
 
-@pytest.mark.skipif(
-    not rfc6638_users, reason="need rfc6638_users to be set in order to run this test"
-)
-@pytest.mark.skipif(
-    len(rfc6638_users) < 3,
-    reason="need at least three users in rfc6638_users to be set in order to run this test",
-)
-class TestScheduling:
-    """Testing support of RFC6638.
+class TestSchedulingBase:
+    """
+    Base class for RFC6638 scheduling tests.  Not collected directly by
+    pytest (no ``Test`` prefix); concrete subclasses supply ``_users``.
+
     TODO: work in progress.  Stalled a bit due to lack of proper testing accounts.  I haven't managed to get this test to pass at any systems yet, but I believe the problem is not on the library side.
     * icloud: cannot really test much with only one test account
       available.  I did some testing forth and back with emails sent
@@ -701,6 +697,9 @@ class TestScheduling:
       RFC6638.
     """
 
+    ## Subclasses set this to the list of user connection dicts to use.
+    _users: list[dict] = []
+
     def _getCalendar(self, i):
         calendar_id = "schedulingnosetestcalendar%i" % i
         calendar_name = "caldav scheduling test %i" % i
@@ -713,7 +712,7 @@ def _getCalendar(self, i):
     def setup_method(self):
         self.clients = []
         self.principals = []
-        for foo in rfc6638_users:
+        for foo in self._users:
             c = client(**foo)
             if not c.check_scheduling_support():
                 continue  ## ignoring user because server does not support scheduling.
@@ -790,6 +789,15 @@ def testInviteAndRespond(self):
     ## inbox/outbox?
 
 
+## Legacy: run TestScheduling against the top-level rfc6638_users config.
+if rfc6638_users:
+    TestScheduling = type(
+        "TestScheduling",
+        (TestSchedulingBase,),
+        {"_users": rfc6638_users},
+    )
+
+
 def _delay_decorator(f, t=20):
     def foo(*a, **kwa):
         time.sleep(t)
@@ -1096,14 +1104,12 @@ def testSupport(self):
         assert self.caldav.check_scheduling_support() == self.is_supported("scheduling")
 
     def testSchedulingInfo(self):
-        self.skip_unless_support("scheduling")
-        ## TODO: add scheduling.calendar-user-address-set sub-feature check
+        self.skip_unless_support("scheduling.calendar-user-address-set")
         calendar_user_address_set = self.principal.calendar_user_address_set()
         me_a_participant = self.principal.get_vcal_address()
 
     def testSchedulingMailboxes(self):
-        self.skip_unless_support("scheduling")
-        ## TODO: add scheduling.mailbox sub-feature check
+        self.skip_unless_support("scheduling.mailbox")
         inbox = self.principal.schedule_inbox()
         outbox = self.principal.schedule_outbox()
 
@@ -3676,3 +3682,13 @@ def testWithEnvironment(self):
         (RepeatedFunctionalTestsBaseClass,),
         {"server_params": _caldav_server},
     )
+
+    # If the server has scheduling_users configured, also generate a
+    # TestSchedulingForServer* class so scheduling tests run per-server.
+    if "scheduling_users" in _caldav_server:
+        _sched_classname = "TestSchedulingForServer" + _servername
+        vars()[_sched_classname] = type(
+            _sched_classname,
+            (TestSchedulingBase,),
+            {"_users": _caldav_server["scheduling_users"]},
+        )

tests/test_servers/base.py

@@ -201,6 +201,9 @@ def get_server_params(self) -> dict[str, Any]:
         # Pass through SSL verification setting if configured
         if "ssl_verify_cert" in self.config:
             params["ssl_verify_cert"] = self.config["ssl_verify_cert"]
+        # Pass through scheduling_users if configured (for TestScheduling generation)
+        if "scheduling_users" in self.config:
+            params["scheduling_users"] = self.config["scheduling_users"]
         # Check if server is already running (either started by us or externally)
         already_running = self._started or self.is_accessible()
         if already_running: