From 1396d6f262b8944e10b50bb2db38e5d22e08be78 Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas@nexedi.com>
Date: Mon, 17 May 2010 17:20:47 +0000
Subject: [PATCH] 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
---
product/ERP5SyncML/tests/testERP5DocumentSyncML.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/product/ERP5SyncML/tests/testERP5DocumentSyncML.py b/product/ERP5SyncML/tests/testERP5DocumentSyncML.py
index 253566cf28..78c49c4163 100644
--- a/product/ERP5SyncML/tests/testERP5DocumentSyncML.py
+++ b/product/ERP5SyncML/tests/testERP5DocumentSyncML.py
@@ -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 :
--
2.30.9