[CalendarServer-changes] [8700] CalendarServer/branches/users/glyph/migrate-merge

[source_changes at macosforge.org]

Revision: 8700
          http://trac.macosforge.org/projects/calendarserver/changeset/8700
Author:   glyph at apple.com
Date:     2012-02-16 04:29:02 -0800 (Thu, 16 Feb 2012)
Log Message:
-----------
Use distinct values for UID and name in the tests.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/test/test_util.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/migrate-merge/

Modified: CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/test/test_util.py
===================================================================
--- CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/test/test_util.py	2012-02-16 12:28:59 UTC (rev 8699)
+++ CalendarServer/branches/users/glyph/migrate-merge/txdav/caldav/datastore/test/test_util.py	2012-02-16 12:29:02 UTC (rev 8700)
@@ -514,13 +514,13 @@
         yield self.createConflicted(
             {
                 "same-name": self.sampleEvent("same-name", "source"),
-                "other-name": self.sampleEvent("other-name", "source other"),
+                "other-name": self.sampleEvent("other-uid", "source other"),
                 "other-calendar": self.sampleEvent("oc", "source calendar"),
                 "no-conflict": self.sampleEvent("no-conflict", "okay"),
             },
             {
                 "same-name": self.sampleEvent("same-name", "target"),
-                "different-name": self.sampleEvent("other-name", "tgt other"),
+                "different-name": self.sampleEvent("other-uid", "tgt other"),
             },
         )
         txn = self.transactionUnderTest()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120216/d66c8e6d/attachment-0001.html>