[CalendarServer-changes] [8228] CalendarServer/trunk/twistedcaldav/scheduling/test/test_icaldiff.py

[source_changes at macosforge.org]

Revision: 8228
          http://trac.macosforge.org/projects/calendarserver/changeset/8228
Author:   cdaboo at apple.com
Date:     2011-10-26 11:15:02 -0700 (Wed, 26 Oct 2011)
Log Message:
-----------
Fix test fails due to indeterminate ordering of results.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/scheduling/test/test_icaldiff.py

Modified: CalendarServer/trunk/twistedcaldav/scheduling/test/test_icaldiff.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/test/test_icaldiff.py	2011-10-26 14:15:41 UTC (rev 8227)
+++ CalendarServer/trunk/twistedcaldav/scheduling/test/test_icaldiff.py	2011-10-26 18:15:02 UTC (rev 8228)
@@ -1180,7 +1180,7 @@
             diffResult = (
                 diffResult[0],
                 diffResult[1],
-                tuple(diffResult[2]),
+                tuple(sorted(diffResult[2])),
                 str(diffResult[3]).replace("\r", "") if diffResult[3] else None,
             )
             self.assertEqual(diffResult, result, msg="%s: actual result: (%s)" % (description, ", ".join([str(i).replace("\r", "") for i in diffResult]),))
@@ -1677,7 +1677,7 @@
             diffResult = (
                 diffResult[0],
                 diffResult[1],
-                tuple(diffResult[2]),
+                tuple(sorted(diffResult[2])),
                 str(diffResult[3]).replace("\r", "") if diffResult[3] else None,
             )
             self.assertEqual(diffResult, result, msg="%s: actual result: (%s)" % (description, ", ".join([str(i).replace("\r", "") for i in diffResult]),))
@@ -2019,7 +2019,7 @@
             diffResult = (
                 diffResult[0],
                 diffResult[1],
-                tuple(diffResult[2]),
+                tuple(sorted(diffResult[2])),
                 str(diffResult[3]).replace("\r", "") if diffResult[3] else None,
             )
             self.assertEqual(diffResult, result, msg="%s: actual result: (%s)" % (description, ", ".join([str(i).replace("\r", "") for i in diffResult]),))
@@ -2383,7 +2383,7 @@
             diffResult = (
                 diffResult[0],
                 diffResult[1],
-                tuple(diffResult[2]),
+                tuple(sorted(diffResult[2])),
                 str(diffResult[3]).replace("\r", "") if diffResult[3] else None,
             )
             self.assertEqual(diffResult, result, msg="%s: actual result: (%s)" % (description, ", ".join([str(i).replace("\r", "") for i in diffResult]),))
@@ -2662,7 +2662,7 @@
             diffResult = (
                 diffResult[0],
                 diffResult[1],
-                tuple(diffResult[2]),
+                tuple(sorted(diffResult[2])),
                 str(diffResult[3]).replace("\r", "") if diffResult[3] else None,
             )
             self.assertEqual(diffResult, result, msg="%s: actual result: (%s)" % (description, ", ".join([str(i).replace("\r", "") for i in diffResult]),))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111026/8be276a4/attachment.html>