slapos_erp5: test: use the same Sale Supply for Computer and Software

master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5VirtualMasterScenario.py

@@ -458,27 +458,20 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
       "instance product", project, public_server_software, public_instance_type
     )
 
+    self.logout()
+    self.login(sale_person.getUserId())
+
     sale_supply = self.portal.sale_supply_module.newContent(
       portal_type="Sale Supply",
-      title="price for %s" % software_product.getRelativeUrl(),
+      title="price for %s" % project.getRelativeUrl(),
       source_project_value=project,
       price_currency_value=currency
     )
-    # XXX Put price in sale supply module
     sale_supply.newContent(
       portal_type="Sale Supply Line",
       base_price=9,
       resource_value=software_product
     )
-    sale_supply.validate()
-
-    sale_supply = self.portal.sale_supply_module.newContent(
-      portal_type="Sale Supply",
-      title="price for compute node",
-      source_project_value=project,
-      price_currency_value=currency
-    )
-    # XXX Put price in sale supply module
     sale_supply.newContent(
       portal_type="Sale Supply Line",
       base_price=99,
@@ -605,13 +598,13 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
     # 5 (can reduce to 2) assignment
     # 16 simulation mvt
     # 3 packing list / line
-    # 4 sale supply / line
+    # 3 sale supply / line
     # 2 sale trade condition
     # 1 software installation
     # 1 software instance
     # 1 software product
     # 3 subscription requests
-    self.assertRelatedObjectCount(project, 52)
+    self.assertRelatedObjectCount(project, 51)
 
     self.checkERP5StateBeforeExit()