Commit 31a561fc authored by Jérome Perrin's avatar Jérome Perrin

selenium test runner: only configure cloudooo by URL

host and port configuration is obsoleted by URL configuration
parent 6f0fa7c9
...@@ -5,8 +5,8 @@ subversion working copy paths and conversion server address. ...@@ -5,8 +5,8 @@ subversion working copy paths and conversion server address.
It's not meant to be called by zelenium tests directly. It's not meant to be called by zelenium tests directly.
""" """
if conversion_server_url is None and (conversion_server_address is None or conversion_server_port is None): if conversion_server_url is None:
raise TypeError("argument conversion_server_url (or conversion_server_{address,port}) should not be None") raise TypeError("argument conversion_server_url should not be None")
pref = getattr(context.portal_preferences, "erp5_ui_test_preference", None) pref = getattr(context.portal_preferences, "erp5_ui_test_preference", None)
if pref is None: if pref is None:
...@@ -27,8 +27,6 @@ if pref is None: ...@@ -27,8 +27,6 @@ if pref is None:
priority=1) priority=1)
pref.setPreferredDocumentConversionServerUrl(conversion_server_url) pref.setPreferredDocumentConversionServerUrl(conversion_server_url)
pref.setPreferredOoodocServerAddress(conversion_server_hostname)
pref.setPreferredOoodocServerPortNumber(conversion_server_port)
if pref.getPreferenceState() == 'disabled': if pref.getPreferenceState() == 'disabled':
pref.enable() pref.enable()
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>working_copy_list, conversion_server_hostname=None, conversion_server_port=None, conversion_server_url=None</string> </value> <value> <string>working_copy_list, conversion_server_url=None</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -377,8 +377,6 @@ class ERP5TypeFunctionalTestCase(ERP5TypeTestCase): ...@@ -377,8 +377,6 @@ class ERP5TypeFunctionalTestCase(ERP5TypeTestCase):
self.portal.Zuite_setPreference( self.portal.Zuite_setPreference(
working_copy_list=bt5_dir_list, working_copy_list=bt5_dir_list,
conversion_server_url=conversion_dict['url'], conversion_server_url=conversion_dict['url'],
conversion_server_hostname=conversion_dict['hostname'],
conversion_server_port=conversion_dict['port']
) )
# XXX Memcached is missing # XXX Memcached is missing
# XXX Persistent cache setup is missing # XXX Persistent cache setup is missing
......
...@@ -287,14 +287,9 @@ user_pref("capability.principal.codebase.p1.subjectName", "");""" % \ ...@@ -287,14 +287,9 @@ user_pref("capability.principal.codebase.p1.subjectName", "");""" % \
conversion_server_port = os.environ.get('conversion_server_port', '8008') conversion_server_port = os.environ.get('conversion_server_port', '8008')
urllib2.urlopen('%s/Zuite_setPreference?__ac_name=' urllib2.urlopen('%s/Zuite_setPreference?__ac_name='
'%s&__ac_password=%s&working_copy_list=%s' '%s&__ac_password=%s&working_copy_list=%s'
'&conversion_server_url=%s' '&conversion_server_url=%s'%
'&conversion_server_hostname=%s'
'&conversion_server_port=%s'%
(self.portal_url, self.user, self.password, (self.portal_url, self.user, self.password,
bt5_dir_list, conversion_server_url, bt5_dir_list, conversion_server_url,))
conversion_server_hostname,
conversion_server_port))
def unsubscribeFromTimerService(self): def unsubscribeFromTimerService(self):
urllib2.urlopen('%s/portal_activities/?unsubscribe:method=' urllib2.urlopen('%s/portal_activities/?unsubscribe:method='
......
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