[CalendarServer-changes] [10823] CalendarServer/trunk/calendarserver/tools/test/test_calverify.py

source_changes at macosforge.org source_changes at macosforge.org
Thu Feb 28 07:51:39 PST 2013


Revision: 10823
          http://trac.calendarserver.org//changeset/10823
Author:   cdaboo at apple.com
Date:     2013-02-28 07:51:39 -0800 (Thu, 28 Feb 2013)
Log Message:
-----------
Fix intermittent test failure.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/test/test_calverify.py

Modified: CalendarServer/trunk/calendarserver/tools/test/test_calverify.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/test/test_calverify.py	2013-02-28 15:07:49 UTC (rev 10822)
+++ CalendarServer/trunk/calendarserver/tools/test/test_calverify.py	2013-02-28 15:51:39 UTC (rev 10823)
@@ -2285,12 +2285,12 @@
 
         self.assertEqual(calverify.results["Number of events to process"], len(self.requirements[CalVerifyMismatchTestsBase.uuidl1]["calendar"]))
         self.assertEqual(
-            [(i.uid1, i.uid2, str(i.start),) for i in calverify.results["Double-bookings"]],
+            [(sorted((i.uid1, i.uid2,)), str(i.start),) for i in calverify.results["Double-bookings"]],
             [
-                ("INVITE_NO_OVERLAP1_1_ICS", "INVITE_NO_OVERLAP1_2_ICS", "%(year)s0307T120000Z" % {"year": now}),
-                ("INVITE_NO_OVERLAP4_1_ICS", "INVITE_NO_OVERLAP4_2_ICS", "%(year)s0309T120000Z" % {"year": now}),
-                ("INVITE_NO_OVERLAP4_1_ICS", "INVITE_NO_OVERLAP4_2_ICS", "%(year)s0310T120000Z" % {"year": now}),
-                ("INVITE_NO_OVERLAP5_1_ICS", "INVITE_NO_OVERLAP5_2_ICS", "%(year)s0314T130000Z" % {"year": now}),
+                (["INVITE_NO_OVERLAP1_1_ICS", "INVITE_NO_OVERLAP1_2_ICS"], "%(year)s0307T120000Z" % {"year": now}),
+                (["INVITE_NO_OVERLAP4_1_ICS", "INVITE_NO_OVERLAP4_2_ICS"], "%(year)s0309T120000Z" % {"year": now}),
+                (["INVITE_NO_OVERLAP4_1_ICS", "INVITE_NO_OVERLAP4_2_ICS"], "%(year)s0310T120000Z" % {"year": now}),
+                (["INVITE_NO_OVERLAP5_1_ICS", "INVITE_NO_OVERLAP5_2_ICS"], "%(year)s0314T130000Z" % {"year": now}),
             ],
         )
         self.assertEqual(calverify.results["Number of double-bookings"], 4)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130228/55709ca8/attachment.html>


More information about the calendarserver-changes mailing list