Take recurrence exceptions into accout when checking for conflicts

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/unit/test-011-itip.py b/tests/unit/test-011-itip.py
index e5edee5..dafa645 100644
--- a/tests/unit/test-011-itip.py
+++ b/tests/unit/test-011-itip.py
@@ -451,6 +451,23 @@ class TestITip(unittest.TestCase):
         event4.set_end(datetime.datetime(2012,7,1, 10,30,0, tzinfo=pytz.utc))
         self.assertFalse(itip.check_event_conflict(event4, itip_event), "No conflict in two recurring events")
 
+        itip_event = itip.events_from_message(message_from_string(itip_non_multipart))[0]
+
+        rrule.setFrequency(kolabformat.RecurrenceRule.Daily)
+        rrule.setCount(10)
+
+        event5 = Event()
+        event5.set_recurrence(rrule);
+        event5.set_start(datetime.datetime(2012,7,9, 10,0,0, tzinfo=pytz.timezone("Europe/London")))
+        event5.set_end(datetime.datetime(2012,7,9, 11,0,0, tzinfo=pytz.timezone("Europe/London")))
+
+        exception = Event(from_string=str(event5))
+        exception.set_start(datetime.datetime(2012,7,13, 14,0,0, tzinfo=pytz.timezone("Europe/London")))
+        exception.set_end(datetime.datetime(2012,7,13, 16,0,0, tzinfo=pytz.timezone("Europe/London")))
+        exception.set_recurrence_id(datetime.datetime(2012,7,13, 10,0,0, tzinfo=pytz.timezone("Europe/London")), False)
+        event5.add_exception(exception)
+        self.assertFalse(itip.check_event_conflict(event5, itip_event), "No conflict with exception date")
+
 
     def test_003_send_reply(self):
         itip_events = itip.events_from_message(message_from_string(itip_non_multipart))