Revert "quite some bugfixes in latest releases of davical" (commit to…

… the wrong branch) This reverts commit d7226b5.
python-caldav · Dec 30, 2023 · 0581b94 · 0581b94
1 parent 5d65845
commit 0581b94
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/tests/compatibility_issues.py b/tests/compatibility_issues.py
@@ -313,7 +313,10 @@
     #'no_journal', ## it threw a 500 internal server error! ## for old versions
     #'nofreebusy', ## for old versions
     'fragile_sync_tokens', ## no issue raised yet
-    'vtodo_datesearch_nodtstart_task_is_skipped', ## no issue raised yet
+    'vtodo_datesearch_nodtstart_task_is_skipped_in_closed_date_range', ## no issue raised yet
+    'isnotdefined_not_working', ## https://gitlab.com/davical-project/davical/-/issues/281
+    'fastmail_buggy_noexpand_date_search', ## https://gitlab.com/davical-project/davical/-/issues/280
+    "isnotdefined_not_working",
 ]
 
 google = [

diff --git a/tests/test_caldav.py b/tests/test_caldav.py
@@ -1300,7 +1300,12 @@ def testSearchEvent(self):
             if not self.check_compatibility_flag(
                 "category_search_yields_nothing"
             ) and not self.check_compatibility_flag("combined_search_not_working"):
-                assert len(no_events) == 0
+                if self.check_compatibility_flag("fastmail_buggy_noexpand_date_search"):
+                    ## fastmail and davical delivers too many recurring events on a date search
+                    ## (but fastmail anyway won't get here, as combined search is not working with fastmail)
+                    assert len(no_events) == 1
+                else:
+                    assert len(no_events) == 1
             some_events = c.search(
                 comp_class=Event,
                 category="PERSONAL",