tests passes for zimbra now

Author: tobixen

caldav/davclient.py

@@ -150,7 +150,7 @@ def raw(self) -> str:
         ## TODO: this should not really be needed?
         if not hasattr(self, "_raw"):
             self._raw = etree.tostring(cast(_Element, self.tree), pretty_print=True)
-        return self._raw.decode()
+        return to_normal_str(self._raw)
 
     def _strip_to_multistatus(self):
         """

tests/compatibility_issues.py

@@ -248,8 +248,10 @@
         """Robur expands a yearly event into a monthly event.  I believe I've reported this one upstream at some point, but can't find back to it""",
 
     'no_search':
-        """Apparently the calendar server does not support search at all (this often implies that 'object_by_uid_is_broken' has to be set as well)"""
+        """Apparently the calendar server does not support search at all (this often implies that 'object_by_uid_is_broken' has to be set as well)""",
 
+    'no_events_and_tasks_on_same_calendar':
+        """Zimbra has the concept of task lists ... a calendar must either be a calendar with only events, or it can be a task list, but those must never be mixed"""
 }
 
 xandikos = [
@@ -341,6 +343,8 @@
     'text_search_is_exact_match_only',
     'no_relships',
     'isnotdefined_not_working',
+    "no_alarmsearch",
+    "no_events_and_tasks_on_same_calendar",
 
     ## extra features not specified in RFC5545
     "calendar_order",

tests/test_caldav.py

@@ -2541,10 +2541,14 @@ def testCreateOverwriteDeleteEvent(self):
 
         # add event
         e1 = c.save_event(ev1)
-        if not self.check_compatibility_flag("no_todo"):
+
+        todo_ok = not self.check_compatibility_flag(
+            "no_todo"
+        ) and not self.check_compatibility_flag("no_events_and_tasks_on_same_calendar")
+        if todo_ok:
             t1 = c.save_todo(todo)
         assert e1.url is not None
-        if not self.check_compatibility_flag("no_todo"):
+        if todo_ok:
             assert t1.url is not None
         if not self.check_compatibility_flag("event_by_url_is_broken"):
             assert c.event_by_url(e1.url).url == e1.url
@@ -2558,19 +2562,19 @@ def testCreateOverwriteDeleteEvent(self):
         ## (but some calendars may throw a "409 Conflict")
         if not self.check_compatibility_flag("no_overwrite"):
             e2 = c.save_event(ev1)
-            if not self.check_compatibility_flag("no_todo"):
+            if todo_ok:
                 t2 = c.save_todo(todo)
 
             ## add same event with "no_create".  Should work like a charm.
             e2 = c.save_event(ev1, no_create=no_create)
-            if not self.check_compatibility_flag("no_todo"):
+            if todo_ok:
                 t2 = c.save_todo(todo, no_create=no_create)
 
             ## this should also work.
             e2.instance.vevent.summary.value = e2.instance.vevent.summary.value + "!"
             e2.save(no_create=no_create)
 
-            if not self.check_compatibility_flag("no_todo"):
+            if todo_ok:
                 t2.instance.vtodo.summary.value = t2.instance.vtodo.summary.value + "!"
                 t2.save(no_create=no_create)
 
@@ -2582,13 +2586,13 @@ def testCreateOverwriteDeleteEvent(self):
         if not self.check_compatibility_flag("object_by_uid_is_broken"):
             with pytest.raises(error.ConsistencyError):
                 c.save_event(ev1, no_overwrite=True)
-            if not self.check_compatibility_flag("no_todo"):
+            if todo_ok:
                 with pytest.raises(error.ConsistencyError):
                     c.save_todo(todo, no_overwrite=True)
 
         # delete event
         e1.delete()
-        if not self.check_compatibility_flag("no_todo"):
+        if todo_ok:
             t1.delete()
 
         if self.check_compatibility_flag("non_existing_raises_other"):