Commit bbd23bb6 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

since r28862 (whose typo is fixed in 29088), content_md5 property also...

since r28862 (whose typo is fixed in 29088), content_md5 property also differs. so number of conflicts is increaded by one. also add a test fo confirm which properties differ.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29496 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent da1f305c
......@@ -906,7 +906,10 @@ class TestERP5DocumentSyncML(TestERP5DocumentSyncMLMixin, ERP5TypeTestCase):
self.tic()
self.synchronize(self.sub_id1)
conflict_list = portal_sync.getConflictList()
self.assertEqual(len(conflict_list), 5)
self.assertEqual(len(conflict_list), 6)
self.assertEqual(sorted([x.getKeyword() for x in conflict_list]),
['content_md5', 'content_type', 'description',
'short_title', 'source_reference', 'title'])
# check if we have the state conflict on all clients
self.checkSynchronizationStateIsConflict()
# we will take :
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment