diff --git a/radicale/tests/test_base.py b/radicale/tests/test_base.py index ae512e02..d9a5e260 100644 --- a/radicale/tests/test_base.py +++ b/radicale/tests/test_base.py @@ -401,15 +401,15 @@ class BaseRequestsMixIn: assert status == 200 assert answer.count("BEGIN:VEVENT") == 2 - def _test_filter(self, filters, kind="event", items=1): + def _test_filter(self, filters, kind="event", items=(1,)): filters_text = "".join( "%s" % filter_ for filter_ in filters) status, _, _ = self.request("DELETE", "/calendar.ics/") assert status in (200, 404) status, _, _ = self.request("MKCALENDAR", "/calendar.ics/") assert status == 201 - for i in range(items): - filename = "{}{}.ics".format(kind, i + 1) + for i in items: + filename = "{}{}.ics".format(kind, i) event = get_file_content(filename) status, _, _ = self.request( "PUT", "/calendar.ics/%s" % filename, event) @@ -621,7 +621,7 @@ class BaseRequestsMixIn: - """], "event", items=5) + """], "event", items=range(1, 6)) assert "href>/calendar.ics/event1.ics/calendar.ics/event2.ics/calendar.ics/event3.ics - """], items=5) + """], items=range(1, 6)) assert "href>/calendar.ics/event1.ics/calendar.ics/event2.ics/calendar.ics/event3.ics - """], items=5) + """], items=range(1, 6)) assert "href>/calendar.ics/event1.ics/calendar.ics/event2.ics/calendar.ics/event3.ics - """], items=5) + """], items=range(1, 6)) assert "href>/calendar.ics/event1.ics/calendar.ics/event2.ics/calendar.ics/event3.ics - """], items=5) + """], items=range(1, 6)) assert "href>/calendar.ics/event1.ics/calendar.ics/event2.ics/calendar.ics/event3.ics - """], items=5) + """], items=range(1, 6)) assert "href>/calendar.ics/event1.ics/calendar.ics/event2.ics/calendar.ics/event3.ics - """], items=7) + """], items=(6, 7)) # HACK: VObject doesn't match RECURRENCE-ID to recurrences, the # overwritten recurrence is still used for filtering. assert "href>/calendar.ics/event6.ics - """], items=7) + """], items=(6, 7)) assert "href>/calendar.ics/event6.ics/calendar.ics/event7.ics - """], "event", items=2) + """], "event", items=(1, 2)) assert "href>/calendar.ics/event1.ics/calendar.ics/event2.ics - """], "event", items=2) + """], "event", items=(1, 2)) assert "href>/calendar.ics/event1.ics/calendar.ics/event2.ics - """], "event", items=2) + """], "event", items=(1, 2)) assert "href>/calendar.ics/event1.ics/calendar.ics/event2.ics - """], "event", items=2) + """], "event", items=(1, 2)) assert "href>/calendar.ics/event1.ics/calendar.ics/event2.ics - """], "todo", items=8) + """], "todo", items=range(1, 9)) assert "href>/calendar.ics/todo1.ics/calendar.ics/todo2.ics/calendar.ics/todo3.ics - """], "todo", items=8) + """], "todo", items=range(1, 9)) assert "href>/calendar.ics/todo1.ics/calendar.ics/todo2.ics/calendar.ics/todo3.ics - """], "todo", items=8) + """], "todo", items=range(1, 9)) assert "href>/calendar.ics/todo2.ics - """], "todo", items=8) + """], "todo", items=range(1, 9)) assert "href>/calendar.ics/todo2.ics - """], "todo", items=8) + """], "todo", items=range(1, 9)) assert "href>/calendar.ics/todo3.ics - """], "todo", items=8) + """], "todo", items=range(1, 9)) assert "href>/calendar.ics/todo7.ics - """], "todo", items=2) + """], "todo", items=(1, 2)) assert "href>/calendar.ics/todo1.ics/calendar.ics/todo2.ics - """], "todo", items=2) + """], "todo", items=(1, 2)) assert "href>/calendar.ics/todo1.ics/calendar.ics/todo2.ics - """], "todo", items=2) + """], "todo", items=(1, 2)) assert "href>/calendar.ics/todo1.ics/calendar.ics/todo2.ics - """], "todo", items=2) + """], "todo", items=(1, 2)) assert "href>/calendar.ics/todo1.ics/calendar.ics/todo2.ics - """], "journal", items=3) + """], "journal", items=(1, 2, 3)) assert "href>/calendar.ics/journal1.ics/calendar.ics/journal2.ics/calendar.ics/journal3.ics - """], "journal", items=3) + """], "journal", items=(1, 2, 3)) assert "href>/calendar.ics/journal1.ics/calendar.ics/journal2.ics/calendar.ics/journal3.ics - """], "journal", items=3) + """], "journal", items=(1, 2, 3)) assert "href>/calendar.ics/journal1.ics/calendar.ics/journal2.ics/calendar.ics/journal3.ics - """], "journal", items=3) + """], "journal", items=(1, 2, 3)) assert "href>/calendar.ics/journal1.ics/calendar.ics/journal2.ics/calendar.ics/journal3.ics - """], "journal", items=3) + """], "journal", items=(1, 2, 3)) assert "href>/calendar.ics/journal1.ics/calendar.ics/journal2.ics/calendar.ics/journal3.ics - """], "journal", items=2) + """], "journal", items=(1, 2)) assert "href>/calendar.ics/journal1.ics/calendar.ics/journal2.ics - """], "journal", items=2) + """], "journal", items=(1, 2)) assert "href>/calendar.ics/journal1.ics/calendar.ics/journal2.ics - """], "journal", items=2) + """], "journal", items=(1, 2)) assert "href>/calendar.ics/journal1.ics/calendar.ics/journal2.ics