Commit 8e7e2c05 authored by Nicolas Delaby's avatar Nicolas Delaby

get oood coordinates from ENV

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35829 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 3b5651f9
...@@ -30,8 +30,9 @@ ...@@ -30,8 +30,9 @@
import os import os
import unittest import unittest
from Testing import ZopeTestCase from Testing import ZopeTestCase
from runUnitTest import tests_home from Products.ERP5Type.tests.runUnitTest import tests_home
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase,\
_getConversionServerDict
from AccessControl.SecurityManagement import newSecurityManager from AccessControl.SecurityManagement import newSecurityManager
from Products.ERP5SyncML.Conduit.ERP5DocumentConduit import ERP5DocumentConduit from Products.ERP5SyncML.Conduit.ERP5DocumentConduit import ERP5DocumentConduit
from Products.ERP5SyncML.SyncCode import SyncCode from Products.ERP5SyncML.SyncCode import SyncCode
...@@ -42,7 +43,6 @@ from ERP5Diff import ERP5Diff ...@@ -42,7 +43,6 @@ from ERP5Diff import ERP5Diff
from lxml import etree from lxml import etree
from Products.ERP5Type.tests.utils import FileUpload from Products.ERP5Type.tests.utils import FileUpload
ooodoc_coordinates = ('127.0.0.1', 8008)
test_files = os.path.join(os.path.dirname(__file__), 'test_document') test_files = os.path.join(os.path.dirname(__file__), 'test_document')
FILE_NAME_REGULAR_EXPRESSION = "(?P<reference>[A-Z]{3,10})-\ FILE_NAME_REGULAR_EXPRESSION = "(?P<reference>[A-Z]{3,10})-\
(?P<language>[a-z]{2})-(?P<version>[0-9]{3})" (?P<language>[a-z]{2})-(?P<version>[0-9]{3})"
...@@ -53,7 +53,7 @@ def makeFileUpload(name): ...@@ -53,7 +53,7 @@ def makeFileUpload(name):
path = os.path.join(test_files, name) path = os.path.join(test_files, name)
return FileUpload(path, name) return FileUpload(path, name)
class TestERP5DocumentSyncMLMixin: class TestERP5DocumentSyncMLMixin(ERP5TypeTestCase):
nb_objects = 10 nb_objects = 10
#for objects #for objects
...@@ -144,8 +144,9 @@ class TestERP5DocumentSyncMLMixin: ...@@ -144,8 +144,9 @@ class TestERP5DocumentSyncMLMixin:
def setSystemPreferences(self): def setSystemPreferences(self):
default_pref = self.portal.portal_preferences.default_site_preference default_pref = self.portal.portal_preferences.default_site_preference
default_pref.setPreferredOoodocServerAddress(ooodoc_coordinates[0]) conversion_dict = _getConversionServerDict()
default_pref.setPreferredOoodocServerPortNumber(ooodoc_coordinates[1]) default_pref.setPreferredOoodocServerAddress(conversion_dict['hostname'])
default_pref.setPreferredOoodocServerPortNumber(conversion_dict['port'])
default_pref.setPreferredDocumentFileNameRegularExpression(FILE_NAME_REGULAR_EXPRESSION) default_pref.setPreferredDocumentFileNameRegularExpression(FILE_NAME_REGULAR_EXPRESSION)
default_pref.setPreferredDocumentReferenceRegularExpression(REFERENCE_REGULAR_EXPRESSION) default_pref.setPreferredDocumentReferenceRegularExpression(REFERENCE_REGULAR_EXPRESSION)
if default_pref.getPreferenceState() == 'disabled': if default_pref.getPreferenceState() == 'disabled':
......
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