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
92
Merge Requests
92
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
02f9e50f
Commit
02f9e50f
authored
Sep 07, 2018
by
Jérome Perrin
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: instance-zope: fix indentation in jinja template
parent
579c9bc1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
19 deletions
+19
-19
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+1
-1
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+18
-18
No files found.
stack/erp5/buildout.hash.cfg
View file @
02f9e50f
...
...
@@ -82,7 +82,7 @@ md5sum = 3e650915959ff31c9c13c84069bbcd35
[template-zope]
filename = instance-zope.cfg.in
md5sum =
b198e346e147a04b879f78ac7046ae36
md5sum =
fb2d13df700f5ae149e357f534d66e05
[template-balancer]
filename = instance-balancer.cfg.in
...
...
stack/erp5/instance-zope.cfg.in
View file @
02f9e50f
...
...
@@ -90,10 +90,10 @@ context =
key password test-zelenium-runner-parameter:password
key bin_path test-zelenium-runner-parameter:bin-path
{% else -%}
{% if test_runner_enabled and test_runner_node_count -%}
{% for _ in range(test_runner_node_count) %}
{% do test_runner_address_list.append((ipv4, next_port())) %}
{% endfor %}
{%
if test_runner_enabled and test_runner_node_count -%}
{%
for _ in range(test_runner_node_count) %}
{%
do test_runner_address_list.append((ipv4, next_port())) %}
{%
endfor %}
[{{ section('run-unit-test-userhosts-wrapper') }}]
<= userhosts-wrapper-base
...
...
@@ -105,19 +105,19 @@ wrapper-path = ${buildout:bin-directory}/runUnitTest
wrapped-command-line = ${runTestSuite:wrapper-path}
wrapper-path = ${buildout:bin-directory}/runTestSuite
{% set connection_string_list = [] -%}
{% for url in slapparameter_dict['mysql-test-url-list'] -%}
{% set parsed_url = urlparse.urlparse(url) -%}
{% do connection_string_list.append(
'%s@%s:%s %s %s' % (
parsed_url.path.lstrip('/'),
parsed_url.hostname,
parsed_url.port,
parsed_url.username,
parsed_url.password,
),
) -%}
{% endfor -%}
{%
set connection_string_list = [] -%}
{%
for url in slapparameter_dict['mysql-test-url-list'] -%}
{%
set parsed_url = urlparse.urlparse(url) -%}
{%
do connection_string_list.append(
'%s@%s:%s %s %s' % (
parsed_url.path.lstrip('/'),
parsed_url.hostname,
parsed_url.port,
parsed_url.username,
parsed_url.password,
),
) -%}
{%
endfor -%}
[run-test-common]
< = run-common
environment-extra =
...
...
@@ -170,7 +170,7 @@ expected-not-value = not-ready
path = ${directory:promises}/${:_buildout_section_name_}
expected-value =
{%- endif %}
{%-
endif %}
{%- endif %}
[directory]
...
...
Jérome Perrin
@jerome
mentioned in merge request
!374 (merged)
·
Sep 11, 2018
mentioned in merge request
!374 (merged)
mentioned in merge request !374
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