Commit 4c363c22 authored by Rafael Monnerat's avatar Rafael Monnerat

Revert "testSlapOSMixin: bootstrapSite became irrelevant"

This reverts commit 9a6d0533
parent c93060e5
Pipeline #10883 failed with stage
in 0 seconds
...@@ -169,6 +169,7 @@ class testSlapOSMixin(ERP5TypeTestCase): ...@@ -169,6 +169,7 @@ class testSlapOSMixin(ERP5TypeTestCase):
return return
self.portal.portal_caches.erp5_site_global_id = '%s' % random.random() self.portal.portal_caches.erp5_site_global_id = '%s' % random.random()
self.portal.portal_caches._p_changed = 1 self.portal.portal_caches._p_changed = 1
self.createCertificateAuthorityFile()
self.commit() self.commit()
self.portal.portal_caches.updateCache() self.portal.portal_caches.updateCache()
...@@ -183,10 +184,11 @@ class testSlapOSMixin(ERP5TypeTestCase): ...@@ -183,10 +184,11 @@ class testSlapOSMixin(ERP5TypeTestCase):
config.product_config["initsite"] = initsite config.product_config["initsite"] = initsite
self.createCertificateAuthorityFile() self.createCertificateAuthorityFile()
self.getDefaultSystemPreference().setPreferredHateoasUrl("http://dummy/") if not getattr(self.portal, 'is_site_bootstrapped', 0):
self.getDefaultSystemPreference().setPreferredAuthenticationPolicyEnabled(True) self.portal.is_site_bootstrapped = 1
self.clearCache() self.bootstrapSite()
self.tic() self.portal._p_changed = 1
self.commit()
def deSetUpPersistentDummyMailHost(self): def deSetUpPersistentDummyMailHost(self):
if 'MailHost' in self.portal.objectIds(): if 'MailHost' in self.portal.objectIds():
...@@ -221,6 +223,14 @@ class testSlapOSMixin(ERP5TypeTestCase): ...@@ -221,6 +223,14 @@ class testSlapOSMixin(ERP5TypeTestCase):
self.portal.portal_configurator.startInstallation( self.portal.portal_configurator.startInstallation(
business_configuration,REQUEST=self.portal.REQUEST) 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): def getExpectedBusinessTemplateInstalledAfterConfiguration(self):
return [ 'erp5_core', return [ 'erp5_core',
'erp5_xhtml_style', 'erp5_xhtml_style',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment