slapos_erp5: test_virtual_master_slave_on_same_tree_without_accounting_scenario

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

@@ -737,18 +737,9 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
 
 
   def test_virtual_master_slave_on_same_tree_without_accounting_scenario(self):
-    # create a default project
-    project = self.addProject()
-    self.web_site = self.portal.web_site_module.slapos_master_panel
+    _, _, _, sale_person = self.bootstrapVirtualMasterTest()
 
-    preference = self.portal.portal_preferences.slapos_default_system_preference
-    preference.edit(
-      preferred_subscription_assignment_category_list=[
-        'function/customer',
-        'role/client',
-        'destination_project/%s' % project.getRelativeUrl()
-      ]
-    )
+    self.web_site = self.portal.web_site_module.slapos_master_panel
 
     # some preparation
     self.logout()
@@ -761,7 +752,25 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
     owner_person = self.portal.portal_catalog.getResultValue(
       portal_type="ERP5 Login",
       reference=owner_reference).getParentValue()
+    self.tic()
+
+    self.logout()
+    self.login(sale_person.getUserId())
+    # create a default project
+    project_relative_url = self.addProject(person=owner_person)
+
+    self.logout()
+    self.login()
+    project = self.portal.restrictedTraverse(project_relative_url)
 
+    preference = self.portal.portal_preferences.slapos_default_system_preference
+    preference.edit(
+      preferred_subscription_assignment_category_list=[
+        'function/customer',
+        'role/client',
+        'destination_project/%s' % project.getRelativeUrl()
+      ]
+    )
     # first slapos administrator assignment can only be created by
     # the erp5 manager
     self.addProjectProductionManagerAssignment(owner_person, project)
@@ -827,13 +836,17 @@ class TestSlapOSVirtualMasterScenario(TestSlapOSVirtualMasterScenarioMixin):
 
     self.login()
     # Ensure no unexpected object has been created
-    # 3 (can reduce to 2) assignment, 1 instance tree, 1 compute node, 1 software installation
+    # 3 allocation supply/line/cell
+    # 1 compute node
+    # 1 credential request
+    # 1 instance tree
+    # 6 open sale order / line
+    # 2 assignments
+    # 1 software installation
     # 2 software instance
-    # 2 credential request
     # 1 software product
-    # 3 allocation supply/line/cell
-    related_object_list = project.Base_getRelatedObjectList(**{'category.category_strict_membership': 1})
-    assert len(related_object_list) == 14, [x.getRelativeUrl() for x in related_object_list]
+    # 3 subscription request
+    self.assertRelatedObjectCount(project, 23)
 
     self.stepcheckERP5Consistency()