slapos_subscription_request: project needed for scenario tests

master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSContractAlarm.xml

@@ -6,12 +6,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_recorded_property_dict</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>default_reference</string> </key>
             <value> <string>testSlapOSContractAlarm</string> </value>
@@ -55,28 +49,13 @@
         <item>
             <key> <string>workflow_history</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="PersistentMapping" module="Persistence.mapping"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>data</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
@@ -89,7 +68,7 @@
                 <item>
                     <key> <string>component_validation_workflow</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -98,7 +77,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>

master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionDualOrganisationScenario.py

@@ -171,7 +171,7 @@ class testSlapOSSubscriptionDualOrganisationScenario(TestSlapOSSubscriptionScena
     name="ABC %s" % self.new_id
 
     self.login()
-    self.createNormalUser(default_email_text, name, language)
+    self.createNormalUser(default_email_text, name, language, self.subscription_project)
 
     self.tic()
 

master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionScenario.py

@@ -163,14 +163,6 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
       if str(notification_message.getVersion("")) == "999":
         notification_message.invalidate()
 
-  def createProject(self):
-    project = self.portal.project_module.newContent(
-      portal_type='Project',
-      title='project-%s' % self.generateNewId()
-    )
-    project.validate()
-    return project
-
   def createNotificationMessage(self, reference,
       content_type='text/html', language="en", text_content='${name} ${login_name} ${login_password}'):
 
@@ -187,41 +179,6 @@ return dict(vads_url_already_registered="%s/already_registered" % (payment_trans
     notification_message.validate()
     return notification_message
 
-  def createAdminUser(self, project):
-    """ Create a Admin user, to manage compute_nodes and instances eventually """
-    admin_user_login = self.portal.portal_catalog.getResultValue(
-      portal_type="ERP5 Login",
-      reference="admin_user",
-      validation_state="validated"
-    )
-
-    if admin_user_login is None:
-      admin_user = self.portal.person_module.template_member.\
-                                 Base_createCloneDocument(batch_mode=1)
-
-      admin_user.newContent(
-        portal_type="ERP5 Login",
-        reference="admin_user").validate()
-      admin_user.edit(
-        first_name="Admin User",
-        reference="Admin_user",
-        default_email_text="do_not_reply_to_admin@example.org",
-      )
-
-      admin_user.validate()
-
-    else:
-      admin_user = admin_user_login.getParentValue()
-
-    admin_user.newContent(
-      portal_type='Assignment',
-      destination_project_value=project,
-      function='computer/manager'
-    ).open()
-
-    self.admin_user = admin_user
-
-
   def createNormalUser(self, email, name, language, project):
     """ Create a Normal user """
     normal_user_login = self.portal.portal_catalog.getResultValue(