diff --git a/product/ERP5OOo/tests/testDms.py b/product/ERP5OOo/tests/testDms.py index a777b646fae611f65d0d298ca5e3f0d9d589860a..cc8840476cf3533af3c5cf1be5148cb2c1f96209 100644 --- a/product/ERP5OOo/tests/testDms.py +++ b/product/ERP5OOo/tests/testDms.py @@ -118,7 +118,8 @@ class TestDocument(ERP5TypeTestCase, ZopeTestCase.Functional): default_pref.setPreferredOoodocServerPortNumber(conversion_server_host[1]) default_pref.setPreferredDocumentFileNameRegularExpression(FILE_NAME_REGULAR_EXPRESSION) default_pref.setPreferredDocumentReferenceRegularExpression(REFERENCE_REGULAR_EXPRESSION) - default_pref.enable() + if default_pref.getPreferenceState() != 'global': + default_pref.enable() def getDocumentModule(self): return getattr(self.getPortal(),'document_module') @@ -784,7 +785,8 @@ class TestDocumentWithSecurity(ERP5TypeTestCase): default_pref.setPreferredOoodocServerPortNumber(conversion_server_host[1]) default_pref.setPreferredDocumentFileNameRegularExpression(FILE_NAME_REGULAR_EXPRESSION) default_pref.setPreferredDocumentReferenceRegularExpression(REFERENCE_REGULAR_EXPRESSION) - default_pref.enable() + if default_pref.getPreferenceState() != 'global': + default_pref.enable() transaction.commit() self.tic() diff --git a/product/ERP5OOo/tests/testIngestion.py b/product/ERP5OOo/tests/testIngestion.py index aa1bce1005bd29e41d0a97b7a8dbbff10c52811d..bdb28c0d33e4b472055295b75e1a09d97808e90f 100644 --- a/product/ERP5OOo/tests/testIngestion.py +++ b/product/ERP5OOo/tests/testIngestion.py @@ -122,7 +122,8 @@ class TestIngestion(ERP5TypeTestCase): default_pref.setPreferredOoodocServerPortNumber(conversion_server_host[1]) default_pref.setPreferredDocumentFileNameRegularExpression(FILE_NAME_REGULAR_EXPRESSION) default_pref.setPreferredDocumentReferenceRegularExpression(REFERENCE_REGULAR_EXPRESSION) - default_pref.enable() + if default_pref.getPreferenceState() != 'global': + default_pref.enable() def setSimulatedNotificationScript(self, sequence=None, sequence_list=None, **kw): """