Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
cb63edb7
Commit
cb63edb7
authored
Jul 07, 2017
by
Julien Muchembled
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5.test: pass new --conversion_server_url option to runUnitTest
parent
16c310e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
slapos/recipe/erp5_test/__init__.py
slapos/recipe/erp5_test/__init__.py
+4
-1
No files found.
slapos/recipe/erp5_test/__init__.py
View file @
cb63edb7
...
@@ -57,7 +57,8 @@ class Recipe(GenericBaseRecipe):
...
@@ -57,7 +57,8 @@ class Recipe(GenericBaseRecipe):
mysql_parsed
.
password
,
mysql_parsed
.
password
,
))
))
mysql_connection_string
=
mysql_connection_string_list
.
pop
()
mysql_connection_string
=
mysql_connection_string_list
.
pop
()
cloudooo_parsed
=
urlparse
.
urlparse
(
self
.
options
[
'cloudooo-url'
])
cloudooo_url
=
self
.
options
[
'cloudooo-url'
]
cloudooo_parsed
=
urlparse
.
urlparse
(
cloudooo_url
)
memcached_parsed
=
urlparse
.
urlparse
(
self
.
options
[
'memcached-url'
])
memcached_parsed
=
urlparse
.
urlparse
(
self
.
options
[
'memcached-url'
])
kumofs_parsed
=
urlparse
.
urlparse
(
self
.
options
[
'kumofs-url'
])
kumofs_parsed
=
urlparse
.
urlparse
(
self
.
options
[
'kumofs-url'
])
common_dict
=
dict
(
common_dict
=
dict
(
...
@@ -67,6 +68,8 @@ class Recipe(GenericBaseRecipe):
...
@@ -67,6 +68,8 @@ class Recipe(GenericBaseRecipe):
test_ca_path
=
self
.
options
[
'certificate-authority-path'
],
test_ca_path
=
self
.
options
[
'certificate-authority-path'
],
)
)
common_list
=
[
common_list
=
[
'--conversion_server_url='
+
cloudooo_url
,
# BBB: We still have test suites that only accept the following 2 options.
'--conversion_server_hostname=%s'
%
cloudooo_parsed
.
hostname
,
'--conversion_server_hostname=%s'
%
cloudooo_parsed
.
hostname
,
'--conversion_server_port=%s'
%
cloudooo_parsed
.
port
,
'--conversion_server_port=%s'
%
cloudooo_parsed
.
port
,
'--volatile_memcached_server_hostname=%s'
%
memcached_parsed
.
hostname
,
'--volatile_memcached_server_hostname=%s'
%
memcached_parsed
.
hostname
,
...
...
Tristan Cavelier
@tc
mentioned in merge request
!90 (closed)
·
Oct 10, 2017
mentioned in merge request
!90 (closed)
mentioned in merge request !90
Toggle commit list
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