[Erp5-report] r39997 jm - in /erp5/trunk/products: ERP5/tests/ ERP5Legacy/tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Sun Nov 7 04:10:17 CET 2010
Author: jm
Date: Sun Nov 7 04:10:15 2010
New Revision: 39997
URL: http://svn.erp5.org?rev=39997&view=rev
Log:
Do not clear activities unconditionally at the beginning of each test
Clean up of activities is already handled by ERP5TypeTestCase.tearDown
Modified:
erp5/trunk/products/ERP5/tests/testOrderBuilder.py
erp5/trunk/products/ERP5/tests/testProductionOrder.py
erp5/trunk/products/ERP5/tests/testProductionOrderApparel.py
erp5/trunk/products/ERP5Legacy/tests/testLegacyProductionOrder.py
Modified: erp5/trunk/products/ERP5/tests/testOrderBuilder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testOrderBuilder.py?rev=39997&r1=39996&r2=39997&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testOrderBuilder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testOrderBuilder.py [utf8] Sun Nov 7 04:10:15 2010
@@ -59,14 +59,6 @@ class TestOrderBuilderMixin(TestOrderMix
max_delay = 0.0
min_flow = 0.0
- def stepClearActivities(self, sequence=None, sequence_list=None,
- **kw):
- """
- Clear activity tables
- """
- activity_tool = self.getPortal().portal_activities
- activity_tool.manageClearActivities(keep=0)
-
def stepSetMaxDelayOnResource(self, sequence=None, sequence_list=None,
**kw):
"""
@@ -364,7 +356,6 @@ class TestOrderBuilder(TestOrderBuilderM
run_all_test = 1
common_sequence_string = '\
- ClearActivities \
CreateOrganisation \
CreateNotVariatedResource \
SetMaxDelayOnResource \
@@ -407,7 +398,6 @@ class TestOrderBuilder(TestOrderBuilderM
if not run: return
sequence_string = '\
- ClearActivities \
CreateOrganisation \
CreateVariatedResource \
SetMaxDelayOnResource \
Modified: erp5/trunk/products/ERP5/tests/testProductionOrder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testProductionOrder.py?rev=39997&r1=39996&r2=39997&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testProductionOrder.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testProductionOrder.py [utf8] Sun Nov 7 04:10:15 2010
@@ -177,14 +177,6 @@ class TestProductionOrderMixin(TestOrder
resource_list.append(resource)
sequence.edit( resource_list = resource_list )
- def stepClearActivities(self, sequence=None, sequence_list=None,
- **kw):
- """
- Clear activity tables
- """
- activity_tool = self.getPortal().portal_activities
- activity_tool.manageClearActivities(keep=0)
-
def stepCreateProductionOrganisation1(self, sequence=None, sequence_list=None,
**kw):
"""
@@ -1297,7 +1289,6 @@ class TestProductionOrderMixin(TestOrder
self.assertEquals(0, len(supply_movement.objectValues()))
SOURCING_ORDER_SEQUENCE = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \
CreateSourcingSC \
@@ -1333,7 +1324,6 @@ class TestProductionOrder(TestProduction
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionSC \
CreateNotVariatedResource \
@@ -1359,7 +1349,6 @@ class TestProductionOrder(TestProduction
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \
CreateSourcingSC \
@@ -1384,7 +1373,6 @@ class TestProductionOrder(TestProduction
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionOrganisation2 \
CreateSupplyOrganisation1 \
@@ -1414,7 +1402,6 @@ class TestProductionOrder(TestProduction
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionSC \
CreateNotVariatedResource \
@@ -1453,7 +1440,6 @@ class TestProductionOrder(TestProduction
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionOrganisation2 \
CreateSupplyOrganisation1 \
@@ -1508,7 +1494,6 @@ class TestProductionOrder(TestProduction
if not run: return
bootstrap_sequence_string = '\
- ClearActivities \
CreateNotVariatedResource \
CreateOrder \
'
@@ -1593,7 +1578,6 @@ class TestProductionOrder(TestProduction
if not run: return
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \
CreateSourcingSC \
@@ -1725,7 +1709,6 @@ class TestProductionOrder(TestProduction
}
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \
CreateSourcingSC \
@@ -1770,7 +1753,6 @@ class TestProductionOrder(TestProduction
if not run: return
sequence_list = SequenceList()
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionSC \
CopyPasteSupplyChain \
@@ -1848,7 +1830,6 @@ class TestProductionOrder(TestProduction
if not run: return
sequence_list = SequenceList()
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionSC \
CreateEmptySC \
Modified: erp5/trunk/products/ERP5/tests/testProductionOrderApparel.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testProductionOrderApparel.py?rev=39997&r1=39996&r2=39997&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testProductionOrderApparel.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testProductionOrderApparel.py [utf8] Sun Nov 7 04:10:15 2010
@@ -72,14 +72,6 @@ class TestProductionOrderApparelMixin(Te
portal_type='Category',
id=category_id)
- def stepClearActivities(self, sequence=None, sequence_list=None,
- **kw):
- """
- Clear activity tables
- """
- activity_tool = self.getPortal().portal_activities
- activity_tool.manageClearActivities(keep=0)
-
def stepCreateProductionOrganisation1(self, sequence=None, sequence_list=None,
**kw):
"""
@@ -916,7 +908,6 @@ class TestProductionOrderApparelMixin(Te
self.assertEquals(0, len(supply_movement.objectValues()))
SOURCING_ORDER_SEQUENCE = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \
CreateSourcingSC \
@@ -952,7 +943,6 @@ class TestProductionOrderApparel(TestPro
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionSC \
CreateVariatedResource \
@@ -978,7 +968,6 @@ class TestProductionOrderApparel(TestPro
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \
CreateSourcingSC \
@@ -1003,7 +992,6 @@ class TestProductionOrderApparel(TestPro
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionOrganisation2 \
CreateSupplyOrganisation1 \
@@ -1033,7 +1021,6 @@ class TestProductionOrderApparel(TestPro
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionSC \
CreateVariatedResource \
@@ -1072,7 +1059,6 @@ class TestProductionOrderApparel(TestPro
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionOrganisation2 \
CreateSupplyOrganisation1 \
@@ -1127,7 +1113,6 @@ class TestProductionOrderApparel(TestPro
if not run: return
bootstrap_sequence_string = '\
- ClearActivities \
CreateNotVariatedResource \
CreateOrder \
'
@@ -1224,7 +1209,6 @@ class TestProductionOrderApparel(TestPro
if not run: return
sequence_list = SequenceList()
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionSC \
CopyPasteSupplyChain \
@@ -1302,7 +1286,6 @@ class TestProductionOrderApparel(TestPro
if not run: return
sequence_list = SequenceList()
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionSC \
CreateEmptySC \
Modified: erp5/trunk/products/ERP5Legacy/tests/testLegacyProductionOrder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Legacy/tests/testLegacyProductionOrder.py?rev=39997&r1=39996&r2=39997&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Legacy/tests/testLegacyProductionOrder.py [utf8] (original)
+++ erp5/trunk/products/ERP5Legacy/tests/testLegacyProductionOrder.py [utf8] Sun Nov 7 04:10:15 2010
@@ -177,14 +177,6 @@ class TestProductionOrderMixin(TestOrder
resource_list.append(resource)
sequence.edit( resource_list = resource_list )
- def stepClearActivities(self, sequence=None, sequence_list=None,
- **kw):
- """
- Clear activity tables
- """
- activity_tool = self.getPortal().portal_activities
- activity_tool.manageClearActivities(keep=0)
-
def stepCreateProductionOrganisation1(self, sequence=None, sequence_list=None,
**kw):
"""
@@ -1281,7 +1273,6 @@ class TestProductionOrderMixin(TestOrder
self.assertEquals(0, len(supply_movement.objectValues()))
SOURCING_ORDER_SEQUENCE = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \
CreateSourcingSC \
@@ -1317,7 +1308,6 @@ class TestProductionOrder(TestProduction
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionSC \
CreateNotVariatedResource \
@@ -1343,7 +1333,6 @@ class TestProductionOrder(TestProduction
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \
CreateSourcingSC \
@@ -1368,7 +1357,6 @@ class TestProductionOrder(TestProduction
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionOrganisation2 \
CreateSupplyOrganisation1 \
@@ -1398,7 +1386,6 @@ class TestProductionOrder(TestProduction
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionSC \
CreateNotVariatedResource \
@@ -1437,7 +1424,6 @@ class TestProductionOrder(TestProduction
sequence_list = SequenceList()
# Test when order is
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionOrganisation2 \
CreateSupplyOrganisation1 \
@@ -1492,7 +1478,6 @@ class TestProductionOrder(TestProduction
if not run: return
bootstrap_sequence_string = '\
- ClearActivities \
CreateNotVariatedResource \
CreateOrder \
'
@@ -1577,7 +1562,6 @@ class TestProductionOrder(TestProduction
if not run: return
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \
CreateSourcingSC \
@@ -1709,7 +1693,6 @@ class TestProductionOrder(TestProduction
}
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \
CreateSourcingSC \
@@ -1754,7 +1737,6 @@ class TestProductionOrder(TestProduction
if not run: return
sequence_list = SequenceList()
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionSC \
CopyPasteSupplyChain \
@@ -1832,7 +1814,6 @@ class TestProductionOrder(TestProduction
if not run: return
sequence_list = SequenceList()
sequence_string = '\
- ClearActivities \
CreateProductionOrganisation1 \
CreateProductionSC \
CreateEmptySC \
More information about the Erp5-report
mailing list