work in progress

Author: tobixen

caldav/compatibility_hints.py

@@ -75,6 +75,18 @@ class FeatureSet:
                 }
             }
         },
+        "save-load": {
+            "description": "it's possible to save and load objects to the calendar",
+            "features": {
+                "event": {"description": "it's possible to save and load events to the calendar"},
+                "todo": {
+                    "description": "it's possible to save and load objects to the calendar",
+                    "features": {
+                        "mixed-calendar": {"description": "The same calendar may contain both events and tasks"},
+                    }
+                },
+            }
+        },
         "search": {
             "description": "calendar MUST support searching for objects using the REPORT method, as specified in RFC4791, section 7",
             "features": {
@@ -90,6 +102,8 @@ class FeatureSet:
                 }
             }
         },
+        ## TODO: perhaps recurrences should not be a root node?  Perhaps it
+        ## should be a sub-node under search and save-load?
         "recurrences": {
             "description": "Support for recurring events and tasks",
             "features": {
@@ -535,8 +549,6 @@ def _dotted_feature_set_list(self, feature_path, feature_node, compact, feature_
 }
 
 xandikos = {
-    "recurrences.expanded-search": {'support': 'unsupported'},
-    "recurrences.search-includes-implicit-recurrences": {'support': 'unsupported'},
     "old_flags":  [
     ## https://github.com/jelmer/xandikos/issues/8
     'date_todo_search_ignores_duration',

caldav/davclient.py

@@ -1093,8 +1093,8 @@ def get_davclient(
             idx = os.environ.get("PYTHON_CALDAV_TEST_SERVER_IDX")
             try:
                 idx = int(idx)
-            except ValueError:
-                pass
+            except (ValueError, TypeError):
+                idx = None
             name = name or os.environ.get("PYTHON_CALDAV_TEST_SERVER_NAME")
             if name and not idx:
                 try:

tests/test_caldav.py

@@ -2360,7 +2360,7 @@ def testTodoDatesearch(self):
         self.skip_on_compatibility_flag("read_only")
         # bedeworks does not support VTODO
         self.skip_on_compatibility_flag("no_todo")
-        self.skip_on_compatibility_flag("no_todo_datesearch")
+        self.skip_unless_support("search.time-range.todo")
         self.skip_on_compatibility_flag("no_search")
         c = self._fixCalendar(supported_calendar_component_set=["VTODO"])
 
@@ -3099,7 +3099,7 @@ def testRecurringDateWithExceptionSearch(self):
 
         asserts_on_results = [r]
         if self.check_support(
-            "recurrences.expanded-search.recurrence-exception-handling"
+            "recurrences.expanded-search.exception"
         ):
             asserts_on_results.append(rs)