fix: Improved async tests. Fixing bugs discovered.

Fixing:

* Zimbra compatibility fix: omit DisplayName from MKCALENDAR body when
  create-calendar.set-displayname is unsupported (see below)
* _async_put did not await the retry coroutine returned by _post_put. (Found when investigating Ox test breakages)
* _async_get_object_by_uid was missing include_completed=True, which the sync get_object_by_uid always passes.  (Found when investigating Ox test breakages)
* _async_search_with_comptypes did not skip component types that the server does not support, unlike the sync _search_with_comptypes which already had this guard. (found when testing towards OX)

Test code:

* Add more fixtures and helpers for async tests
* Add 7 async tests, mirroring the sync
  RepeatedFunctionalTestsBaseClass CRUD tests
* Fixing up the tests to be more or less symmetric with the sync tests
  (and prettyfying the sync tests while being at it)
* Rearranged the async testing fixtures to avoid Ox throwing errors when same event ended up in multiple calendars.

prompt: An issue was created with `git bug bug new`, it has id 099db26 comment has id 009999d.  Please start with Phase 1 and update the issue, but in a separate temporary worktree on a branch spun off from v3.2-preparations
prompt: continue with phase 2
prompt: tests/test_async_integration.py::TestAsyncForXandikos::test_multi_get fails (...), fix multiget in collection.py to be async-aware, following the pattern in docs/design/ASYNC_DUAL_MODE.md
followup-prompt: wait. calendar_multiget is deprecated and scheduled for deletion. Any test code exercising calendar_multiget can be removed or rewritten to use self.multiget instead.
prompt: please help me investigate the tests/test_async_integration.py::TestAsyncForZimbra::test_lookup_event breakage.  It's a known problem with zimbra that a GET towards an event URL frequently yields 404, but the .load()-method should have fallbacks to .multiget(), and the caldav-server-tester in ~/caldav-server-tester claims that the current versions of Zimbra have no problems with such GETs
prompt: (lots of arguing with Claude)
prompt: (trying a new claude session) With `pytest -k 'zimbra and  lookup'` the sync test passes, while the async test fails.  Why?  There shouldn't be any difference there?  (you've already investigated two hypotheses: "zimbra does not support quoted at-sign in the URL" and "the uid has been used on another calendar, therefore the GET returns 404", both hypotheses are wrong, and does not explain the asymmetry between sync and async)
prompt: tests/test_async_integration.py::TestAsyncForOx::test_object_by_uid breaks
followup-prompt: (when giving two options on how to fix the tests / test fixtures) Isn't it a third option here too - use a static UID, but different from well_known_1?  I think we should make things as symmetric as possible and reuse the same calendar.  It shouldn't be persistent, except for servers that doesn't support create/delete calendars.

Mostly AI-generated, with some hands-on adjustments (AI-generating test code is fine, when done under good supervision - though I wonder a bit if I would have been able to do this faster without AI-help)

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

Author: tobixen

caldav/calendarobjectresource.py

@@ -1071,6 +1071,7 @@ async def _async_load_by_multiget(self) -> Self:
     def _post_load_by_multiget(self, items):
         if not items:
             raise error.NotFoundError(self.url)
+        items = iter(items)
         url_data = next(items, None)
         if url_data is None:
             ## We shouldn't come here.  Something is wrong.
@@ -1147,7 +1148,10 @@ def _put(self, retry_on_failure=True) -> "None | Coroutine[Any, Any, None]":
 
     async def _async_put(self, headers, retry_on_failure=True):
         r = await self.client.put(str(self.url), str(self.data), headers | ICALH)
-        return self._post_put(r, retry_on_failure)
+        result = self._post_put(r, retry_on_failure)
+        if result is not None:
+            # _post_put returned a retry coroutine (self._put(False) for async client)
+            await result
 
     def _post_put(self, r, retry_on_failure):
         if r.status == 412:

caldav/collection.py

@@ -723,7 +723,14 @@ def _create(
 
         prop = dav.Prop()
         display_name = None
-        if name:
+        # Some servers (e.g. Zimbra) use the DisplayName from the MKCALENDAR body
+        # as the calendar URL, ignoring the actual request path.  When the server
+        # does not support setting a separate display name, omit it from the body so
+        # the request URL path is used as the calendar identifier.
+        supports_displayname = not self.client or self.client.features.is_supported(
+            "create-calendar.set-displayname"
+        )
+        if name and supports_displayname:
             display_name = dav.DisplayName(name)
             prop += [display_name]
         if supported_calendar_component_set:
@@ -747,7 +754,7 @@ def _create(
         # on setting the DisplayName on calendar creation
         # (DAViCal, Zimbra, ...).  Doing an attempt on explicitly setting the
         # display name using PROPPATCH.
-        if name:
+        if display_name:
             try:
                 self.set_properties([display_name])
             except Exception:
@@ -766,7 +773,7 @@ async def _async_create(self, path, mkcol, method, name, display_name) -> None:
         await self._query(root=mkcol, query_method=method, url=path, expected_return_value=201)
 
         # COMPATIBILITY ISSUE - try to set display name explicitly
-        if name:
+        if display_name:
             try:
                 await self.set_properties([display_name])
             except Exception:
@@ -1080,6 +1087,7 @@ def _multiget(self, event_urls: Iterable[URL], raise_notfound: bool = False) ->
         """
         get multiple events' data.
         TODO: Does it overlap the _request_report_build_resultlist method
+        ## WARNING: async logic is duplicated in _async_multiget — mirror any changes there
         """
         if self.url is None:
             raise ValueError("Unexpected value None for self.url")
@@ -1098,28 +1106,33 @@ def _multiget(self, event_urls: Iterable[URL], raise_notfound: bool = False) ->
         for r in results:
             yield (r, results[r][cdav.CalendarData.tag])
 
-    ## Replace the last lines with
+    def _post_multiget(self, results: Iterable[tuple[str, str]]) -> list[_CC]:
+        """Post-processing shared by multiget and _async_multiget_objects."""
+        return [
+            self._calendar_comp_class_by_data(data)(
+                self.client,
+                # Quote path to handle servers returning unencoded spaces (e.g., Zimbra)
+                url=self.url.join(quote(unquote(str(url)), safe="/:@")),
+                data=data,
+                parent=self,
+            )
+            for url, data in results
+        ]
+
     def multiget(self, event_urls: Iterable[URL], raise_notfound: bool = False) -> Iterable[_CC]:
         """
         get multiple events' data
         TODO: Does it overlap the _request_report_build_resultlist method?
         @author mtorange@gmail.com (refactored by Tobias)
         """
-        results = self._multiget(event_urls, raise_notfound=raise_notfound)
-        for url, data in results:
-            # Quote path to handle servers returning unencoded spaces (e.g., Zimbra)
-            quoted_url = quote(unquote(str(url)), safe="/:@")
-            yield self._calendar_comp_class_by_data(data)(
-                self.client,
-                url=self.url.join(quoted_url),
-                data=data,
-                parent=self,
-            )
+        if self.is_async_client:
+            return self._async_multiget_objects(event_urls, raise_notfound=raise_notfound)
+        return self._post_multiget(self._multiget(event_urls, raise_notfound=raise_notfound))
 
     async def _async_multiget(
         self, event_urls: Iterable[URL], raise_notfound: bool = False
     ) -> list[tuple[str, str]]:
-        """Async version of _multiget — returns a list of (url, data) tuples."""
+        ## WARNING: sync logic is duplicated in _multiget — mirror any changes there
         if self.url is None:
             raise ValueError("Unexpected value None for self.url")
 
@@ -1134,12 +1147,20 @@ async def _async_multiget(
                     raise error.NotFoundError(f"Status {status} in {href}")
         return [(r, results[r][cdav.CalendarData.tag]) for r in results]
 
+    async def _async_multiget_objects(
+        self, event_urls: Iterable[URL], raise_notfound: bool = False
+    ) -> list[_CC]:
+        """Async version of multiget."""
+        return self._post_multiget(
+            await self._async_multiget(event_urls, raise_notfound=raise_notfound)
+        )
+
     def calendar_multiget(self, *largs, **kwargs):
         """
         get multiple events' data
         @author mtorange@gmail.com
         (refactored by Tobias)
-        This is for backward compatibility.  It may be removed in 3.0 or later release.
+        This is for backward compatibility.  It may be removed in a later release.
         """
         return list(self.multiget(*largs, **kwargs))
 
@@ -1605,7 +1626,12 @@ async def _async_get_object_by_uid(
     ) -> "Event":
         """Async helper for get_object_by_uid()."""
         items_found = await self.search(
-            uid=uid, comp_class=comp_class, xml=comp_filter, post_filter=True, _hacks="insist"
+            uid=uid,
+            comp_class=comp_class,
+            xml=comp_filter,
+            post_filter=True,
+            _hacks="insist",
+            include_completed=True,
         )
         items_found = [o for o in items_found if o.id == uid]
 

caldav/search.py

@@ -993,6 +993,10 @@ async def _async_search_with_comptypes(
         assert self.event is None and self.todo is None and self.journal is None
 
         for comp_class in (Event, Todo, Journal):
+            if not calendar.client.features.is_supported(
+                f"save-load.{comp_class.__name__.lower()}"
+            ):
+                continue
             clone = replace(self)
             clone.comp_class = comp_class
             results = await clone.async_search(