Drop name clash.

master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingAlarm.py

@@ -1227,7 +1227,7 @@ if context.getTitle() == 'Not visited by SimulationMovement_buildSlapOS':
       transaction.commit()
   return wrapped
 
-class TestAlarm(testSlapOSMixin):
+class TestSlapOSTriggerBuildAlarm(testSlapOSMixin):
   @simulateSimulationMovement_buildSlapOS
   def test_SimulationMovement_withoutDelivery(self):
     applied_rule = self.portal.portal_simulation.newContent(
@@ -1452,7 +1452,7 @@ if context.getTitle() == 'Not visited by Delivery_manageBuildingCalculatingDeliv
       transaction.commit()
   return wrapped
 
-class TestAlarm(testSlapOSMixin):
+class TestSlapOSManageBuildingCalculatingDeliveryAlarm(testSlapOSMixin):
   @simulateDelivery_manageBuildingCalculatingDelivery
   def _test(self, state, message):
     delivery = self.portal.sale_packing_list_module.newContent(

master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingRule.py

@@ -253,7 +253,7 @@ class TestDefaultInvoicingRule(testSlapOSMixin):
       SimulationMovement.getSimulationState = SimulationMovement\
         .original_getSimulationState
 
-class TestDefaultInvoiceTransactionRule(testSlapOSMixin):
+class TestDefaultPaymentRule(testSlapOSMixin):
   @withAbort
   def test_simulation(self):
     from Products.ERP5.Document.SimulationMovement import SimulationMovement
@@ -600,7 +600,7 @@ class TestHostingSubscriptionSimulation(testSlapOSMixin):
       SimulationMovement.isFrozen = SimulationMovement.originalIsFrozen
       delattr(SimulationMovement, 'originalIsFrozen')
 
-class TestDefaultInvoiceTransactionRule(testSlapOSMixin):
+class TestDefaultTradeModelRule(testSlapOSMixin):
   @withAbort
   def test_simulation(self):
     from Products.ERP5.Document.SimulationMovement import SimulationMovement

master/bt5/slapos_accounting/bt/revision

-94
\ No newline at end of file
+95
\ No newline at end of file