Skip to content

erp5
erp5
Commit 438237e5 authored by Julien Muchembled's avatar Julien Muchembled
Browse files
Options

Do not clear activities unconditionally at the beginning of each test 

Clean up of activities is already handled by ERP5TypeTestCase.tearDown

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39997 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 134cf080
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 65 deletions
product/ERP5/tests/testOrderBuilder.py
View file @ 438237e5
...@@ -59,14 +59,6 @@ class TestOrderBuilderMixin(TestOrderMixin): ...@@ -59,14 +59,6 @@ class TestOrderBuilderMixin(TestOrderMixin):
max_delay = 0.0 max_delay = 0.0
min_flow = 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, def stepSetMaxDelayOnResource(self, sequence=None, sequence_list=None,
**kw): **kw):
""" """
...@@ -364,7 +356,6 @@ class TestOrderBuilder(TestOrderBuilderMixin, ERP5TypeTestCase): ...@@ -364,7 +356,6 @@ class TestOrderBuilder(TestOrderBuilderMixin, ERP5TypeTestCase):
run_all_test = 1 run_all_test = 1
common_sequence_string = '\ common_sequence_string = '\
ClearActivities \
CreateOrganisation \ CreateOrganisation \
CreateNotVariatedResource \ CreateNotVariatedResource \
SetMaxDelayOnResource \ SetMaxDelayOnResource \
...@@ -407,7 +398,6 @@ class TestOrderBuilder(TestOrderBuilderMixin, ERP5TypeTestCase): ...@@ -407,7 +398,6 @@ class TestOrderBuilder(TestOrderBuilderMixin, ERP5TypeTestCase):
if not run: return if not run: return
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateOrganisation \ CreateOrganisation \
CreateVariatedResource \ CreateVariatedResource \
SetMaxDelayOnResource \ SetMaxDelayOnResource \
......
product/ERP5/tests/testProductionOrder.py
View file @ 438237e5
...@@ -177,14 +177,6 @@ class TestProductionOrderMixin(TestOrderMixin): ...@@ -177,14 +177,6 @@ class TestProductionOrderMixin(TestOrderMixin):
resource_list.append(resource) resource_list.append(resource)
sequence.edit( resource_list = resource_list ) 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, def stepCreateProductionOrganisation1(self, sequence=None, sequence_list=None,
**kw): **kw):
""" """
...@@ -1297,7 +1289,6 @@ class TestProductionOrderMixin(TestOrderMixin): ...@@ -1297,7 +1289,6 @@ class TestProductionOrderMixin(TestOrderMixin):
self.assertEquals(0, len(supply_movement.objectValues())) self.assertEquals(0, len(supply_movement.objectValues()))
SOURCING_ORDER_SEQUENCE = '\ SOURCING_ORDER_SEQUENCE = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
CreateSourcingSC \ CreateSourcingSC \
...@@ -1333,7 +1324,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1333,7 +1324,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionSC \ CreateProductionSC \
CreateNotVariatedResource \ CreateNotVariatedResource \
...@@ -1359,7 +1349,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1359,7 +1349,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
CreateSourcingSC \ CreateSourcingSC \
...@@ -1384,7 +1373,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1384,7 +1373,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionOrganisation2 \ CreateProductionOrganisation2 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
...@@ -1414,7 +1402,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1414,7 +1402,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionSC \ CreateProductionSC \
CreateNotVariatedResource \ CreateNotVariatedResource \
...@@ -1453,7 +1440,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1453,7 +1440,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionOrganisation2 \ CreateProductionOrganisation2 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
...@@ -1508,7 +1494,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1508,7 +1494,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
if not run: return if not run: return
bootstrap_sequence_string = '\ bootstrap_sequence_string = '\
ClearActivities \
CreateNotVariatedResource \ CreateNotVariatedResource \
CreateOrder \ CreateOrder \
' '
...@@ -1593,7 +1578,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1593,7 +1578,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
if not run: return if not run: return
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
CreateSourcingSC \ CreateSourcingSC \
...@@ -1725,7 +1709,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1725,7 +1709,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
} }
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
CreateSourcingSC \ CreateSourcingSC \
...@@ -1770,7 +1753,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1770,7 +1753,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
if not run: return if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionSC \ CreateProductionSC \
CopyPasteSupplyChain \ CopyPasteSupplyChain \
...@@ -1848,7 +1830,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1848,7 +1830,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
if not run: return if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionSC \ CreateProductionSC \
CreateEmptySC \ CreateEmptySC \
......
product/ERP5/tests/testProductionOrderApparel.py
View file @ 438237e5
...@@ -72,14 +72,6 @@ class TestProductionOrderApparelMixin(TestOrderMixin): ...@@ -72,14 +72,6 @@ class TestProductionOrderApparelMixin(TestOrderMixin):
portal_type='Category', portal_type='Category',
id=category_id) 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, def stepCreateProductionOrganisation1(self, sequence=None, sequence_list=None,
**kw): **kw):
""" """
...@@ -916,7 +908,6 @@ class TestProductionOrderApparelMixin(TestOrderMixin): ...@@ -916,7 +908,6 @@ class TestProductionOrderApparelMixin(TestOrderMixin):
self.assertEquals(0, len(supply_movement.objectValues())) self.assertEquals(0, len(supply_movement.objectValues()))
SOURCING_ORDER_SEQUENCE = '\ SOURCING_ORDER_SEQUENCE = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
CreateSourcingSC \ CreateSourcingSC \
...@@ -952,7 +943,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa ...@@ -952,7 +943,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionSC \ CreateProductionSC \
CreateVariatedResource \ CreateVariatedResource \
...@@ -978,7 +968,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa ...@@ -978,7 +968,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
CreateSourcingSC \ CreateSourcingSC \
...@@ -1003,7 +992,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa ...@@ -1003,7 +992,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionOrganisation2 \ CreateProductionOrganisation2 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
...@@ -1033,7 +1021,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa ...@@ -1033,7 +1021,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionSC \ CreateProductionSC \
CreateVariatedResource \ CreateVariatedResource \
...@@ -1072,7 +1059,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa ...@@ -1072,7 +1059,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionOrganisation2 \ CreateProductionOrganisation2 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
...@@ -1127,7 +1113,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa ...@@ -1127,7 +1113,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa
if not run: return if not run: return
bootstrap_sequence_string = '\ bootstrap_sequence_string = '\
ClearActivities \
CreateNotVariatedResource \ CreateNotVariatedResource \
CreateOrder \ CreateOrder \
' '
...@@ -1224,7 +1209,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa ...@@ -1224,7 +1209,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa
if not run: return if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionSC \ CreateProductionSC \
CopyPasteSupplyChain \ CopyPasteSupplyChain \
...@@ -1302,7 +1286,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa ...@@ -1302,7 +1286,6 @@ class TestProductionOrderApparel(TestProductionOrderApparelMixin, ERP5TypeTestCa
if not run: return if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionSC \ CreateProductionSC \
CreateEmptySC \ CreateEmptySC \
......
product/ERP5Legacy/tests/testLegacyProductionOrder.py
View file @ 438237e5
...@@ -177,14 +177,6 @@ class TestProductionOrderMixin(TestOrderMixin): ...@@ -177,14 +177,6 @@ class TestProductionOrderMixin(TestOrderMixin):
resource_list.append(resource) resource_list.append(resource)
sequence.edit( resource_list = resource_list ) 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, def stepCreateProductionOrganisation1(self, sequence=None, sequence_list=None,
**kw): **kw):
""" """
...@@ -1281,7 +1273,6 @@ class TestProductionOrderMixin(TestOrderMixin): ...@@ -1281,7 +1273,6 @@ class TestProductionOrderMixin(TestOrderMixin):
self.assertEquals(0, len(supply_movement.objectValues())) self.assertEquals(0, len(supply_movement.objectValues()))
SOURCING_ORDER_SEQUENCE = '\ SOURCING_ORDER_SEQUENCE = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
CreateSourcingSC \ CreateSourcingSC \
...@@ -1317,7 +1308,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1317,7 +1308,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionSC \ CreateProductionSC \
CreateNotVariatedResource \ CreateNotVariatedResource \
...@@ -1343,7 +1333,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1343,7 +1333,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
CreateSourcingSC \ CreateSourcingSC \
...@@ -1368,7 +1357,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1368,7 +1357,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionOrganisation2 \ CreateProductionOrganisation2 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
...@@ -1398,7 +1386,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1398,7 +1386,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionSC \ CreateProductionSC \
CreateNotVariatedResource \ CreateNotVariatedResource \
...@@ -1437,7 +1424,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1437,7 +1424,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
sequence_list = SequenceList() sequence_list = SequenceList()
# Test when order is # Test when order is
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionOrganisation2 \ CreateProductionOrganisation2 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
...@@ -1492,7 +1478,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1492,7 +1478,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
if not run: return if not run: return
bootstrap_sequence_string = '\ bootstrap_sequence_string = '\
ClearActivities \
CreateNotVariatedResource \ CreateNotVariatedResource \
CreateOrder \ CreateOrder \
' '
...@@ -1577,7 +1562,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1577,7 +1562,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
if not run: return if not run: return
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
CreateSourcingSC \ CreateSourcingSC \
...@@ -1709,7 +1693,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1709,7 +1693,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
} }
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateSupplyOrganisation1 \ CreateSupplyOrganisation1 \
CreateSourcingSC \ CreateSourcingSC \
...@@ -1754,7 +1737,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1754,7 +1737,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
if not run: return if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionSC \ CreateProductionSC \
CopyPasteSupplyChain \ CopyPasteSupplyChain \
...@@ -1832,7 +1814,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase): ...@@ -1832,7 +1814,6 @@ class TestProductionOrder(TestProductionOrderMixin, ERP5TypeTestCase):
if not run: return if not run: return
sequence_list = SequenceList() sequence_list = SequenceList()
sequence_string = '\ sequence_string = '\
ClearActivities \
CreateProductionOrganisation1 \ CreateProductionOrganisation1 \
CreateProductionSC \ CreateProductionSC \
CreateEmptySC \ CreateEmptySC \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7