From 689e4862f9d0e019e98a6058c0308fe6677a4e5f Mon Sep 17 00:00:00 2001
From: Tobias Brox <tobias@redpill-linpro.com>
Date: Mon, 18 Nov 2024 20:12:41 +0100
Subject: [PATCH] bugfixing and xandikos compatibility matrix.  xandikos now
 passes with same quirks reported by script

---
 check_server_compatibility.py |  6 +++++-
 tests/compatibility_issues.py | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/check_server_compatibility.py b/check_server_compatibility.py
index d626816..b90f497 100755
--- a/check_server_compatibility.py
+++ b/check_server_compatibility.py
@@ -142,7 +142,11 @@ def check_mkcalendar(self):
 
         makeret = self._try_make_calendar(name="Yep", cal_id="pythoncaldav-test")
         if makeret[0]:
-            self._default_calendar = self.principal.make_calendar(name="Yep", cal_id="pythoncaldav-test")
+            try:
+                self._default_calendar = self.principal.make_calendar(name="Yep", cal_id="pythoncaldav-test")
+            except:
+                self._default_calendar = self.principal.calendar(cal_id="pythoncaldav-test")
+            self._default_calendar.events()
             return
         makeret = self._try_make_calendar(cal_id="pythoncaldav-test")
         if makeret[0]:
diff --git a/tests/compatibility_issues.py b/tests/compatibility_issues.py
index 8c2015d..85b0afe 100644
--- a/tests/compatibility_issues.py
+++ b/tests/compatibility_issues.py
@@ -228,16 +228,25 @@
 
     'text_search_is_exact_match_only',
 
-    ## This one is fixed - but still breaks our test code for python 3.7
-    ## TODO: remove this when shredding support for python 3.7
-    ## https://github.com/jelmer/xandikos/pull/194    
-    'category_search_yields_nothing',
     "search_needs_comptype",
 
     ## scheduling is not supported
     "no_scheduling",
 ]
 
+## This can soon be removed (relevant for running tests under python 3.7 and python 3.8)
+## https://github.com/jelmer/xandikos/pull/194    
+'category_search_yields_nothing',
+try:
+    import xandikos.__version__ as xver
+    goodver = (0,2,12)
+    for i in range(0,2):
+        if xver[i]<goodver[i]:
+            xandikos.append('category_search_needs')
+            break
+except Exception:
+    pass
+
 radicale = [
     ## calendar listings and calendar creation works a bit
     ## "weird" on radicale