testSlapOSMixin: bootstrapSite became irrelevant

master/product/SlapOS/tests/testSlapOSMixin.py

@@ -169,7 +169,6 @@ class testSlapOSMixin(ERP5TypeTestCase):
       return
     self.portal.portal_caches.erp5_site_global_id = '%s' % random.random()
     self.portal.portal_caches._p_changed = 1
-    self.createCertificateAuthorityFile() 
     self.commit()
     self.portal.portal_caches.updateCache()
 
@@ -184,11 +183,10 @@ class testSlapOSMixin(ERP5TypeTestCase):
     config.product_config["initsite"] = initsite
 
     self.createCertificateAuthorityFile() 
-    if not getattr(self.portal, 'is_site_bootstrapped', 0):
-      self.portal.is_site_bootstrapped = 1
-      self.bootstrapSite()
-      self.portal._p_changed = 1
-      self.commit()
+    self.getDefaultSystemPreference().setPreferredHateoasUrl("http://dummy/")
+    self.getDefaultSystemPreference().setPreferredAuthenticationPolicyEnabled(True)
+    self.clearCache()
+    self.tic()
 
   def deSetUpPersistentDummyMailHost(self):
     if 'MailHost' in self.portal.objectIds():
@@ -223,14 +221,6 @@ class testSlapOSMixin(ERP5TypeTestCase):
     self.portal.portal_configurator.startInstallation(
                  business_configuration,REQUEST=self.portal.REQUEST)
 
-  def bootstrapSite(self):
-    self.logMessage('SlapOS bootstrapSite')
-    self.getDefaultSystemPreference().setPreferredHateoasUrl("http://dummy/")
-    self.getDefaultSystemPreference().setPreferredAuthenticationPolicyEnabled(True)
-
-    self.clearCache()
-    self.tic()
-
   def getExpectedBusinessTemplateInstalledAfterConfiguration(self):
     return [ 'erp5_core',
             'erp5_xhtml_style',