Commit 1396d6f2 authored by Nicolas Delaby's avatar Nicolas Delaby

size is a new property which can also conflict.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35403 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 516a8b78
No related merge requests found
......@@ -907,10 +907,10 @@ class TestERP5DocumentSyncML(TestERP5DocumentSyncMLMixin, ERP5TypeTestCase):
self.tic()
self.synchronize(self.sub_id1)
conflict_list = portal_sync.getConflictList()
self.assertEqual(len(conflict_list), 6)
self.assertEqual(len(conflict_list), 7)
self.assertEqual(sorted([x.getKeyword() for x in conflict_list]),
['content_md5', 'content_type', 'description',
'short_title', 'source_reference', 'title'])
'short_title', 'size', '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