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

[officejs_appstore_configurator] Use right mixin

parent f591f171
...@@ -5,15 +5,15 @@ ...@@ -5,15 +5,15 @@
# #
############################################################################## ##############################################################################
from erp5.component.test.SlapOSTestCaseMixin import \ from erp5.component.test.testOfficeJSAppstoreMixin import \
SlapOSTestCaseMixin testOfficeJSAppstoreMixin
import os import os
class TestSlapOSConfigurator(SlapOSTestCaseMixin): class TestSlapOSConfigurator(testOfficeJSAppstoreMixin):
def bootstrapSite(self): def bootstrapSite(self):
SlapOSTestCaseMixin.bootstrapSite(self) testOfficeJSAppstoreMixin.bootstrapSite(self)
self.getBusinessConfiguration().BusinessConfiguration_invokeSlapOSMasterPromiseAlarmList() self.getBusinessConfiguration().BusinessConfiguration_invokeOfficeJSAppstorePromiseAlarmList()
self.tic() self.tic()
def testConfiguredModuleGeneratorIDViaConstraint(self): def testConfiguredModuleGeneratorIDViaConstraint(self):
...@@ -43,13 +43,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin): ...@@ -43,13 +43,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
invoking checkConsistency """ invoking checkConsistency """
self.assertEqual(self.portal.portal_preferences.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): def testConfiguredTemplateToolViaConstraint(self):
""" Make sure Template Tool Repositories was configured well, """ Make sure Template Tool Repositories was configured well,
invoking checkConsistency """ invoking checkConsistency """
...@@ -61,11 +54,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin): ...@@ -61,11 +54,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
def testConfiguredVolatileCache(self): def testConfiguredVolatileCache(self):
""" Make sure Memcached is configured """ 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 \ from Products.ERP5Type.tests.ERP5TypeTestCase import \
_getVolatileMemcachedServerDict _getVolatileMemcachedServerDict
...@@ -78,12 +66,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin): ...@@ -78,12 +66,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
def testConfiguredPersistentCache(self): def testConfiguredPersistentCache(self):
""" Make sure Kumofs is configured """ 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\ from Products.ERP5Type.tests.ERP5TypeTestCase import\
_getPersistentMemcachedServerDict _getPersistentMemcachedServerDict
memcached_tool = self.getPortal().portal_memcached memcached_tool = self.getPortal().portal_memcached
...@@ -95,31 +77,11 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin): ...@@ -95,31 +77,11 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
def testConfiguredConversionServer(self): def testConfiguredConversionServer(self):
""" Make sure Conversion Server (Cloudooo) is """ Make sure Conversion Server (Cloudooo) is
well configured """ 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 # set preference
preference_tool = self.portal.portal_preferences preference_tool = self.portal.portal_preferences
conversion_url = "https://cloudooo.erp5.net" conversion_url = "https://cloudooo.erp5.net"
self.assertEqual(preference_tool.getPreferredDocumentConversionServerUrl(), conversion_url) 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): def testModuleHasIdGeneratorByDay(self):
""" Ensure the Constraint sets appropriate id generator on all modules. """ Ensure the Constraint sets appropriate id generator on all modules.
""" """
......
...@@ -45,7 +45,9 @@ ...@@ -45,7 +45,9 @@
<item> <item>
<key> <string>text_content_warning_message</string> </key> <key> <string>text_content_warning_message</string> </key>
<value> <value>
<tuple/> <tuple>
<string>W: 10, 0: Unused import os (unused-import)</string>
</tuple>
</value> </value>
</item> </item>
<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