Permalink
Browse files

Use distinct values for UID and name in the tests.

  • Loading branch information...
1 parent 33a0313 commit 0e98aef23fbb10c790f04c82d17360f95d766e35 @glyph glyph committed Feb 16, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 txdav/caldav/datastore/test/test_util.py
@@ -514,13 +514,13 @@ def test_migrateMergeConflictingObjects(self):
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()

0 comments on commit 0e98aef

Please sign in to comment.