[Erp5-report] r41618 jm - in /erp5/trunk/products: ERP5/tests/ ERP5Legacy/tests/

[nobody at svn.erp5.org]

Author: jm
Date: Tue Dec 21 16:59:47 2010
New Revision: 41618

URL: http://svn.erp5.org?rev=41618&view=rev
Log:
Some cleanup in TestERP5Commerce

Modified:
    erp5/trunk/products/ERP5/tests/testERP5Commerce.py
    erp5/trunk/products/ERP5Legacy/tests/testLegacyERP5Commerce.py

Modified: erp5/trunk/products/ERP5/tests/testERP5Commerce.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testERP5Commerce.py?rev=41618&r1=41617&r2=41618&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testERP5Commerce.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testERP5Commerce.py [utf8] Tue Dec 21 16:59:47 2010
@@ -34,7 +34,6 @@ import urllib
 
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from Products.ERP5Type.tests.utils import FileUpload
-from Products.ERP5.tests.utils import newSimulationExpectedFailure
 
 SESSION_ID = "12345678"
 LANGUAGE_LIST = ('en', 'fr', 'de', 'bg',)
@@ -91,6 +90,7 @@ class TestCommerce(ERP5TypeTestCase):
   Product_getRelatedDescription
   Person_editPersonalInformation
   """
+  business_process = 'business_process_module/erp5_default_business_process'
 
   def getTitle(self):
     return "E-Commerce System"
@@ -157,11 +157,11 @@ class TestCommerce(ERP5TypeTestCase):
     shipping.setProductLine('shipping')
     shipping.validate()
     shipping.publish()
-    
+
     # add default trade condition
     condition = condition_module.newContent(id="default_trade_condition",
                                             portal_type="Sale Trade Condition",
-                                            specialise="business_process_module/erp5_default_business_process")
+                                            specialise=self.business_process)
     condition.validate()
 
     # validate default order rule

Modified: erp5/trunk/products/ERP5Legacy/tests/testLegacyERP5Commerce.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/tests/testLegacyERP5Commerce.py?rev=41618&r1=41617&r2=41618&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/tests/testLegacyERP5Commerce.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/tests/testLegacyERP5Commerce.py [utf8] Tue Dec 21 16:59:47 2010
@@ -28,4 +28,6 @@
 
 from Products.ERP5Legacy.tests import Legacy_getBusinessTemplateList
 from Products.ERP5.tests.testERP5Commerce import *
+
+TestCommerce.business_process = None
 Legacy_getBusinessTemplateList(TestCommerce)