Fix test on 0.10: conflicts only when other branch is different.

djc · djc · commit fa54c8cd2870 · 2009-12-08T20:32:45.000+01:00
diff --git a/couchdb/tests/client.py b/couchdb/tests/client.py
@@ -264,6 +264,7 @@ def test_bulk_update_all_or_nothing(self):
 
         # update the first doc to provoke a conflict in the next bulk update
         doc = docs[0].copy()
+        doc['name'] = 'Jane Doe'
         self.db[doc['_id']] = doc
 
         results = self.db.update(docs, all_or_nothing=True)
