From 92552919cd0b82265bcb6e71952c92f86e95ed8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Mon, 23 Mar 2015 09:34:04 +0100 Subject: [PATCH] unit tests : erp5_trade depends on erp5_pdm, fix bt5list in unit tests --- product/CMFCategory/tests/testCMFCategory.py | 2 +- product/ERP5/tests/testTradeReports.py | 2 +- product/ERP5/tests/testTranslation.py | 2 +- product/ERP5/tests/testXHTML.py | 2 +- product/ERP5Type/tests/testFunctionalKM.py | 4 ++-- .../ERP5Type/tests/testFunctionalStandaloneUserTutorial.py | 4 ++-- product/ERP5Type/tests/testXMLMatrix.py | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/product/CMFCategory/tests/testCMFCategory.py b/product/CMFCategory/tests/testCMFCategory.py index 3d6e68a7fe..07016c6784 100644 --- a/product/CMFCategory/tests/testCMFCategory.py +++ b/product/CMFCategory/tests/testCMFCategory.py @@ -84,7 +84,7 @@ class TestCMFCategory(ERP5TypeTestCase): /organisation """ - return ('erp5_base', 'erp5_trade') + return ('erp5_base', 'erp5_pdm', 'erp5_trade') def getCategoriesTool(self): return getattr(self.portal, 'portal_categories', None) diff --git a/product/ERP5/tests/testTradeReports.py b/product/ERP5/tests/testTradeReports.py index f1270610b9..e91f137280 100644 --- a/product/ERP5/tests/testTradeReports.py +++ b/product/ERP5/tests/testTradeReports.py @@ -43,7 +43,7 @@ class TestTradeReports(ERP5ReportTestCase): def getBusinessTemplateList(self): """Returns list of BT to be installed.""" return ('erp5_core_proxy_field_legacy', - 'erp5_base', 'erp5_trade', 'erp5_pdm', ) + 'erp5_base', 'erp5_pdm', 'erp5_trade', 'erp5_pdm', ) def login(self): """login with Manager roles.""" diff --git a/product/ERP5/tests/testTranslation.py b/product/ERP5/tests/testTranslation.py index 7609b945a0..5c4699c02b 100644 --- a/product/ERP5/tests/testTranslation.py +++ b/product/ERP5/tests/testTranslation.py @@ -37,10 +37,10 @@ from Products.ERP5Type.Utils import getMessageIdWithContext target_business_templates = ( 'erp5_base', 'erp5_simulation', + 'erp5_pdm', 'erp5_trade', 'erp5_pdf_editor', - 'erp5_pdm', 'erp5_accounting', 'erp5_invoicing', diff --git a/product/ERP5/tests/testXHTML.py b/product/ERP5/tests/testXHTML.py index f24bf23340..24a0a466c6 100644 --- a/product/ERP5/tests/testXHTML.py +++ b/product/ERP5/tests/testXHTML.py @@ -355,10 +355,10 @@ class TestXHTML(TestXHTMLMixin): 'erp5_core_proxy_field_legacy', 'erp5_base', 'erp5_simulation', + 'erp5_pdm', 'erp5_trade', 'erp5_pdf_editor', - 'erp5_pdm', 'erp5_accounting', 'erp5_invoicing', diff --git a/product/ERP5Type/tests/testFunctionalKM.py b/product/ERP5Type/tests/testFunctionalKM.py index 49140e6888..dfd512a4a9 100644 --- a/product/ERP5Type/tests/testFunctionalKM.py +++ b/product/ERP5Type/tests/testFunctionalKM.py @@ -47,8 +47,8 @@ class TestZeleniumKM(ERP5TypeFunctionalTestCase): 'erp5_base', 'erp5_ui_test_core', 'erp5_ui_test', 'erp5_forge', 'erp5_dhtml_style', 'erp5_dhtml_ui_test', 'erp5_jquery', 'erp5_jquery_ui', - 'erp5_knowledge_pad', - 'erp5_trade', 'erp5_pdm', 'erp5_ooo_import', + 'erp5_knowledge_pad', 'erp5_pdm', + 'erp5_trade', 'erp5_ooo_import', 'erp5_accounting', 'erp5_invoicing', 'erp5_simplified_invoicing', 'erp5_project', 'erp5_simulation', 'erp5_simulation_test', diff --git a/product/ERP5Type/tests/testFunctionalStandaloneUserTutorial.py b/product/ERP5Type/tests/testFunctionalStandaloneUserTutorial.py index 736300a595..63d6dc4dca 100644 --- a/product/ERP5Type/tests/testFunctionalStandaloneUserTutorial.py +++ b/product/ERP5Type/tests/testFunctionalStandaloneUserTutorial.py @@ -52,8 +52,8 @@ class TestZeleniumStandaloneUserTutorial(ERP5TypeFunctionalTestCase): 'erp5_base', 'erp5_ui_test_core', 'erp5_forge', 'erp5_dhtml_style', 'erp5_jquery', 'erp5_jquery_ui', - 'erp5_knowledge_pad', - 'erp5_trade', 'erp5_pdm', 'erp5_ooo_import', + 'erp5_knowledge_pad', 'erp5_pdm', + 'erp5_trade', 'erp5_ooo_import', 'erp5_accounting', 'erp5_invoicing', 'erp5_simplified_invoicing', 'erp5_project', 'erp5_simulation', diff --git a/product/ERP5Type/tests/testXMLMatrix.py b/product/ERP5Type/tests/testXMLMatrix.py index 5d463b3b98..93f634e5b6 100644 --- a/product/ERP5Type/tests/testXMLMatrix.py +++ b/product/ERP5Type/tests/testXMLMatrix.py @@ -45,7 +45,7 @@ class TestXMLMatrix(ERP5TypeTestCase, LogInterceptor): """ Return the list of business templates. """ - return ('erp5_base', 'erp5_trade',) + return ('erp5_base', 'erp5_pdm', 'erp5_trade',) def getTitle(self): """ -- 2.30.9