Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5-Boxiang
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hamza
erp5-Boxiang
Commits
31a561fc
Commit
31a561fc
authored
Aug 12, 2016
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
selenium test runner: only configure cloudooo by URL
host and port configuration is obsoleted by URL configuration
parent
6f0fa7c9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
14 deletions
+5
-14
bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_setPreference.py
...tem/portal_skins/erp5_ui_test_core/Zuite_setPreference.py
+2
-4
bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_setPreference.xml
...em/portal_skins/erp5_ui_test_core/Zuite_setPreference.xml
+1
-1
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
+0
-2
product/ERP5Type/tests/runFunctionalTest.py
product/ERP5Type/tests/runFunctionalTest.py
+2
-7
No files found.
bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_setPreference.py
View file @
31a561fc
...
...
@@ -5,8 +5,8 @@ subversion working copy paths and conversion server address.
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
)
:
raise
TypeError
(
"argument conversion_server_url
(or conversion_server_{address,port})
should not be None"
)
if
conversion_server_url
is
None
:
raise
TypeError
(
"argument conversion_server_url should not be None"
)
pref
=
getattr
(
context
.
portal_preferences
,
"erp5_ui_test_preference"
,
None
)
if
pref
is
None
:
...
...
@@ -27,8 +27,6 @@ if pref is None:
priority
=
1
)
pref
.
setPreferredDocumentConversionServerUrl
(
conversion_server_url
)
pref
.
setPreferredOoodocServerAddress
(
conversion_server_hostname
)
pref
.
setPreferredOoodocServerPortNumber
(
conversion_server_port
)
if
pref
.
getPreferenceState
()
==
'disabled'
:
pref
.
enable
()
...
...
bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_setPreference.xml
View file @
31a561fc
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<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>
<key>
<string>
id
</string>
</key>
...
...
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
View file @
31a561fc
...
...
@@ -377,8 +377,6 @@ class ERP5TypeFunctionalTestCase(ERP5TypeTestCase):
self.portal.Zuite_setPreference(
working_copy_list=bt5_dir_list,
conversion_server_url=conversion_dict['url'],
conversion_server_hostname=conversion_dict['hostname'],
conversion_server_port=conversion_dict['port']
)
# XXX Memcached is missing
# XXX Persistent cache setup is missing
...
...
product/ERP5Type/tests/runFunctionalTest.py
View file @
31a561fc
...
...
@@ -287,14 +287,9 @@ user_pref("capability.principal.codebase.p1.subjectName", "");""" % \
conversion_server_port
=
os
.
environ
.
get
(
'conversion_server_port'
,
'8008'
)
urllib2
.
urlopen
(
'%s/Zuite_setPreference?__ac_name='
'%s&__ac_password=%s&working_copy_list=%s'
'&conversion_server_url=%s'
'&conversion_server_hostname=%s'
'&conversion_server_port=%s'
%
'&conversion_server_url=%s'
%
(
self
.
portal_url
,
self
.
user
,
self
.
password
,
bt5_dir_list
,
conversion_server_url
,
conversion_server_hostname
,
conversion_server_port
))
bt5_dir_list
,
conversion_server_url
,))
def
unsubscribeFromTimerService
(
self
):
urllib2
.
urlopen
(
'%s/portal_activities/?unsubscribe:method='
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment