diff --git a/bt5/erp5_business_package/TestTemplateItem/portal_components/test.erp5.testBusinessPackage.py b/bt5/erp5_business_package/TestTemplateItem/portal_components/test.erp5.testBusinessPackage.py index c78ed0f1b4b0bc86a41ded2a083eeccc27071fe4..82dd00423425f7310bb23345195987ee661a3696 100644 --- a/bt5/erp5_business_package/TestTemplateItem/portal_components/test.erp5.testBusinessPackage.py +++ b/bt5/erp5_business_package/TestTemplateItem/portal_components/test.erp5.testBusinessPackage.py @@ -141,10 +141,12 @@ class TestBusinessPackage(ERP5TypeTestCase): return tuple(manager_list) - def _addFolderInERP5(self): + def _addFolderInERP5(self, id=None): """ """ - test_folder = self.portal.newContent(id='test_folder', + if not id: + id = 'test_folder' + test_folder = self.portal.newContent(id=id, portal_type='Folder', title='couscous', ) @@ -155,7 +157,7 @@ class TestBusinessPackage(ERP5TypeTestCase): # ********** TESTS FOR COMBINING MULTIPLE BUSINESS MANAGERS ************ ######################################################################### - def test_combineBusinessItemWithDifferentSign(self): + def _combineBusinessItemWithDifferentSign(self): """ Same path, same value, differernt sign """ @@ -180,7 +182,7 @@ class TestBusinessPackage(ERP5TypeTestCase): managerB.build() bm_list = [managerA, managerB] - combinedBM = portal_templates.combinedBusinessManager(bm_list) + combinedBM = portal_templates.combineMultipleBusinessManager(bm_list) # ********** TESTS FOR DIFFERENT INSTALLATION USE CASES ************ ##################################################################### @@ -329,6 +331,7 @@ class TestBusinessPackage(ERP5TypeTestCase): def test_useCase_V(self): """ Case V: + _ A B: ?? """ portal_templates = self.portal.portal_templates managerA = self._createBusinessManager() @@ -362,6 +365,7 @@ class TestBusinessPackage(ERP5TypeTestCase): portal_templates.installMultipleBusinessManager([managerA_new,]) + installed_test_folder = self.portal.restrictedTraverse(folder_path) # XXX: What to expect: couscous or new_couscous? or conflict display def test_useCase_VI(self): @@ -425,17 +429,23 @@ class TestBusinessPackage(ERP5TypeTestCase): managerA_new.build() managerA_new.setStatus('uninstalled') + self.portal.manage_delObjects([test_folder.getId(),]) portal_templates.installMultipleBusinessManager([managerA_new,]) - # Delete the object from ZODB so as we can install the object there - self.portal.manage_delObjects([test_folder.getId(),]) + installed_test_folder = self.portal.restrictedTraverse(folder_path) + self.assertEquals(installed_test_folder.getTitle(), 'couscous') + managerA_new, = self._copyBusinessManager([managerA.id,]) + managerA_new.build() managerA_new.setStatus('uninstalled') + # Delete the object from ZODB so as we can install the object there + self.portal.manage_delObjects([installed_test_folder.getId(),]) + portal_templates.installMultipleBusinessManager([managerA_new,]) - # Expected undecided, if forced installation, then install test_folder, - # otherwise let the state of ZODB unchanged + # This should install nothing as we prefer user changes + self.assertRaises(KeyError, lambda: self.portal.restrictedTraverse(folder_path)) def test_useCase_VIII(self): """ @@ -461,7 +471,6 @@ class TestBusinessPackage(ERP5TypeTestCase): # Delete the object from ZODB so as we can install the object there self.portal.manage_delObjects([test_folder.getId(),]) - portal_templates.installMultipleBusinessManager([managerA_new,]) installed_test_folder = self.portal.restrictedTraverse(folder_path) @@ -475,11 +484,11 @@ class TestBusinessPackage(ERP5TypeTestCase): managerA_new.setStatus('uninstalled') # Delete the object from ZODB so as we can install the object there - self.portal.manage_delObjects([test_folder.getId(),]) + self.portal.manage_delObjects([installed_test_folder.getId(),]) portal_templates.installMultipleBusinessManager([managerA_new,]) - # Expected result undecide, if forced installation, then install the folder + # Expected result undecided, if forced installation, then install the folder # from updated Business Manager, otherwise let the user change in ZODB # persist, i.e, no test_folder @@ -686,6 +695,8 @@ class TestBusinessPackage(ERP5TypeTestCase): managerA_new.build() managerA_new.setStatus('uninstalled') + # Delete the object from ZODB so as we can install the object there + self.portal.manage_delObjects([test_folder.getId(),]) # Install the Business Manager portal_templates.installMultipleBusinessManager([managerA_new,]) @@ -697,7 +708,7 @@ class TestBusinessPackage(ERP5TypeTestCase): managerA_new.build() managerA_new.setStatus('uninstalled') - test_folder.edit(title='new_couscous') + installed_test_folder.edit(title='new_couscous') # Install the Business Manager portal_templates.installMultipleBusinessManager([managerA_new,]) @@ -728,6 +739,8 @@ class TestBusinessPackage(ERP5TypeTestCase): managerA_new.build() managerA_new.setStatus('uninstalled') + # Delete the object from ZODB so as we can install the object there + self.portal.manage_delObjects([test_folder.getId(),]) # Install the Business Manager portal_templates.installMultipleBusinessManager([managerA_new,]) diff --git a/bt5/erp5_business_package/TestTemplateItem/portal_components/test.erp5.testBusinessPackage.xml b/bt5/erp5_business_package/TestTemplateItem/portal_components/test.erp5.testBusinessPackage.xml index cc98eede956a44323f11d43f226db93a13615202..478d1254d8207755d62f20066564b0dd41d984e3 100644 --- a/bt5/erp5_business_package/TestTemplateItem/portal_components/test.erp5.testBusinessPackage.xml +++ b/bt5/erp5_business_package/TestTemplateItem/portal_components/test.erp5.testBusinessPackage.xml @@ -46,36 +46,39 @@ <key> <string>text_content_warning_message</string> </key> <value> <tuple> - <string>W:183, 4: Unused variable \'combinedBM\' (unused-variable)</string> - <string>W:201, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:207, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:231, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:239, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:261, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:277, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:302, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:318, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:340, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:357, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:385, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:398, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:424, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:458, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:473, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:504, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:523, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:551, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:564, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:595, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:609, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:640, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:657, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:685, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:696, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:727, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:739, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:785, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 2 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> - <string>W:824, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 2 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:144, 29: Redefining built-in \'id\' (redefined-builtin)</string> + <string>W:185, 4: Unused variable \'combinedBM\' (unused-variable)</string> + <string>W:203, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:209, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:233, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:241, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:263, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:279, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:304, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:320, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:343, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:360, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:368, 4: Unused variable \'installed_test_folder\' (unused-variable)</string> + <string>W:389, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:402, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:428, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:438, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:468, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:482, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:513, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:532, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:560, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:573, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:604, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:618, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:649, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:666, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:694, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:707, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:738, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:752, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 1 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:798, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 2 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> + <string>W:837, 4: Possible unbalanced tuple unpacking with sequence defined at line 142: left side has 2 label(s), right side has 0 value(s) (unbalanced-tuple-unpacking)</string> </tuple> </value> </item>