Commit 10ae8480 authored by Romain Courteaud's avatar Romain Courteaud 🐙

[officejs_appstore_configurator] Use right mixin

parent f591f171
......@@ -5,15 +5,15 @@
#
##############################################################################
from erp5.component.test.SlapOSTestCaseMixin import \
SlapOSTestCaseMixin
from erp5.component.test.testOfficeJSAppstoreMixin import \
testOfficeJSAppstoreMixin
import os
class TestSlapOSConfigurator(SlapOSTestCaseMixin):
class TestSlapOSConfigurator(testOfficeJSAppstoreMixin):
def bootstrapSite(self):
SlapOSTestCaseMixin.bootstrapSite(self)
self.getBusinessConfiguration().BusinessConfiguration_invokeSlapOSMasterPromiseAlarmList()
testOfficeJSAppstoreMixin.bootstrapSite(self)
self.getBusinessConfiguration().BusinessConfiguration_invokeOfficeJSAppstorePromiseAlarmList()
self.tic()
def testConfiguredModuleGeneratorIDViaConstraint(self):
......@@ -43,13 +43,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
invoking checkConsistency """
self.assertEqual(self.portal.portal_preferences.checkConsistency(), [])
def testConfiguredCertificateAuthoringConstraint(self):
"""Make sure Certificate Authoring was configured well,
invoking checkConsistency.
Make sure PAS is well configured."""
self.assertEqual(self.portal.portal_certificate_authority.checkConsistency(), [])
def testConfiguredTemplateToolViaConstraint(self):
""" Make sure Template Tool Repositories was configured well,
invoking checkConsistency """
......@@ -61,11 +54,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
def testConfiguredVolatileCache(self):
""" Make sure Memcached is configured
"""
if self.isLiveTest():
# This test is redundant with testConfiguredVolatileCacheViaPromise
# and it is only aims to verify if test environment is behaving as
# expected, nothing else, and if alamrs were invoked.
return
from Products.ERP5Type.tests.ERP5TypeTestCase import \
_getVolatileMemcachedServerDict
......@@ -78,12 +66,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
def testConfiguredPersistentCache(self):
""" Make sure Kumofs is configured
"""
if self.isLiveTest():
# This test is redundant with testConfiguredVolatileCacheViaPromise
# and it is only aims to verify if test environment is behaving as
# expected, nothing else, and if alamrs were invoked.
return
from Products.ERP5Type.tests.ERP5TypeTestCase import\
_getPersistentMemcachedServerDict
memcached_tool = self.getPortal().portal_memcached
......@@ -95,31 +77,11 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
def testConfiguredConversionServer(self):
""" Make sure Conversion Server (Cloudooo) is
well configured """
if self.isLiveTest():
# This test is redundant with testConfiguredConversionServerViaConstraint
# and it is only aims to verify if test environment is behaving as
# expected, nothing else, and if alamrs were invoked.
return
# set preference
preference_tool = self.portal.portal_preferences
conversion_url = "https://cloudooo.erp5.net"
self.assertEqual(preference_tool.getPreferredDocumentConversionServerUrl(), conversion_url)
def testConfiguredCertificateAuthoring(self):
""" Make sure Certificate Authoting is
well configured. """
if self.isLiveTest():
# This test is redundant with testConfiguredVolatileCacheViaPromise
# and it is only aims to verify if test environment is behaving as
# expected, nothing else, and if alamrs were invoked.
return
self.assertTrue(self.portal.hasObject('portal_certificate_authority'))
self.assertEqual(os.environ['TEST_CA_PATH'],
self.portal.portal_certificate_authority.certificate_authority_path)
def testModuleHasIdGeneratorByDay(self):
""" Ensure the Constraint sets appropriate id generator on all modules.
"""
......
......@@ -45,7 +45,9 @@
<item>
<key> <string>text_content_warning_message</string> </key>
<value>
<tuple/>
<tuple>
<string>W: 10, 0: Unused import os (unused-import)</string>
</tuple>
</value>
</item>
<item>
......
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