[CalendarServer-changes] [2819] CalendarServer/branches/users/cdaboo/implicit-2799/twistedcaldav/ scheduling/test/test_icaldiff.py

[source_changes at macosforge.org]

Revision: 2819
          http://trac.macosforge.org/projects/calendarserver/changeset/2819
Author:   cdaboo at apple.com
Date:     2008-08-13 12:49:20 -0700 (Wed, 13 Aug 2008)
Log Message:
-----------
Fix test.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/implicit-2799/twistedcaldav/scheduling/test/test_icaldiff.py

Modified: CalendarServer/branches/users/cdaboo/implicit-2799/twistedcaldav/scheduling/test/test_icaldiff.py
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2799/twistedcaldav/scheduling/test/test_icaldiff.py	2008-08-13 19:35:58 UTC (rev 2818)
+++ CalendarServer/branches/users/cdaboo/implicit-2799/twistedcaldav/scheduling/test/test_icaldiff.py	2008-08-13 19:49:20 UTC (rev 2819)
@@ -830,7 +830,7 @@
 
         for description, calendar1, calendar2, attendee, result in data:
             differ = iCalDiff(Component.fromString(calendar1), Component.fromString(calendar2))
-            self.assertEqual(differ.attendeeDiff(attendee), result, msg=description)
+            self.assertEqual(differ.attendeeMerge(attendee), result, msg=description)
 
     def test_attendee_diff_complex(self):
         
@@ -1162,4 +1162,4 @@
 
         for description, calendar1, calendar2, attendee, result in data:
             differ = iCalDiff(Component.fromString(calendar1), Component.fromString(calendar2))
-            self.assertEqual(differ.attendeeDiff(attendee), result, msg=description)
+            self.assertEqual(differ.attendeeMerge(attendee), result, msg=description)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080813/ed1947f3/attachment.html