From 9b0440429c435084e5b61dbb7795d092a622b720 Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Tue, 12 May 2020 00:47:48 +0200 Subject: [PATCH] Fix ical tests --- shared/tests/mixins.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/shared/tests/mixins.py b/shared/tests/mixins.py index 2a1960fb..235940df 100644 --- a/shared/tests/mixins.py +++ b/shared/tests/mixins.py @@ -101,8 +101,8 @@ class ICalMixin: def _find_event(self, ev, l): for i, elt in enumerate(l): if self._test_event_equal(ev, elt): - return elt, i - return False, -1 + return i + return None def assertCalEqual(self, ical_content, expected): remaining = expected.copy() @@ -111,12 +111,15 @@ class ICalMixin: cal = icalendar.Calendar.from_ical(ical_content) for ev in cal.walk("vevent"): - found, i_found = self._find_event(ev, remaining) - if found: + i_found = self._find_event(ev, remaining) + if i_found is not None: remaining.pop(i_found) else: unexpected.append(ev) + self.assertListEqual(remaining, []) + self.assertListEqual(unexpected, []) + class TestCaseMixin: def assertForbidden(self, response):