[Erp5-report] r45365 seb - /erp5/trunk/products/ERP5Legacy/tests/

[nobody at svn.erp5.org]

Author: seb
Date: Wed Apr 13 13:28:51 2011
New Revision: 45365

URL: http://svn.erp5.org?rev=45365&view=rev
Log:
* deleting rules after test doesn't work if previous test
  totally failed, so this is better in aftersetup
* business_link_portal_type should be defined on the mixin

Modified:
    erp5/trunk/products/ERP5Legacy/tests/testLegacyBPMCore.py
    erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeModelLine.py

Modified: erp5/trunk/products/ERP5Legacy/tests/testLegacyBPMCore.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/tests/testLegacyBPMCore.py?rev=45365&r1=45364&r2=45365&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/tests/testLegacyBPMCore.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/tests/testLegacyBPMCore.py [utf8] Wed Apr 13 13:28:51 2011
@@ -206,15 +206,17 @@ class TestBPMMixin(ERP5TypeTestCase):
   def afterSetUp(self):
     self.validateRules()
     self.createCategories()
+    portal_rules = self.portal.portal_rules
+    if getattr(portal_rules,'test_invoice_transaction_simulation_rule', None)\
+         is not None:
+      portal_rules.manage_delObjects(
+          ids=['test_invoice_transaction_simulation_rule'])
     self.createInvoiceTransactionRule()
     self.stepTic()
 
   def beforeTearDown(self):
     # abort any transaction
     transaction.abort()
-    # remove not needed rules
-    self.portal.portal_rules.manage_delObjects(
-        ids=['test_invoice_transaction_simulation_rule'])
     self.stepTic()
 
 class TestBPMImplementation(TestBPMMixin):

Modified: erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeModelLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeModelLine.py?rev=45365&r1=45364&r2=45365&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeModelLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/tests/testLegacyTradeModelLine.py [utf8] Wed Apr 13 13:28:51 2011
@@ -51,7 +51,7 @@ TestTradeModelLineMixin.getAggregatedAmo
 ##
 
 TestTradeModelLine.trade_model_path_portal_type = None
-TestTradeModelLine.business_link_portal_type = None
+TestTradeModelLineMixin.business_link_portal_type = None
 
 for name in list(TestTradeModelLine.__dict__):
   if '_NewSimulation_' in name: