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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
slapos
Commits
c19f8286
Commit
c19f8286
authored
May 24, 2018
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NEO: the test suite needs mysqldump
parent
a3f09d4d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
software/neoppod/instance-neo-storage-mysql.cfg.in
software/neoppod/instance-neo-storage-mysql.cfg.in
+1
-0
software/neoppod/runTestSuite.in
software/neoppod/runTestSuite.in
+5
-1
software/neoppod/software-common.cfg
software/neoppod/software-common.cfg
+1
-1
software/neoppod/software.cfg
software/neoppod/software.cfg
+1
-1
No files found.
software/neoppod/instance-neo-storage-mysql.cfg.in
View file @
c19f8286
...
@@ -142,6 +142,7 @@ context =
...
@@ -142,6 +142,7 @@ context =
section directory directory
section directory directory
section my_cnf_parameters my-cnf-parameters
section my_cnf_parameters my-cnf-parameters
raw bin_directory {{ bin_directory }}
raw bin_directory {{ bin_directory }}
raw prepend_path {{ ${mysqld:mysql-base-directory}/bin }}
{% endif -%}
{% endif -%}
[buildout]
[buildout]
...
...
software/neoppod/runTestSuite.in
View file @
c19f8286
...
@@ -12,6 +12,9 @@ SUMMARY_RE = re.compile(
...
@@ -12,6 +12,9 @@ SUMMARY_RE = re.compile(
r' (.*) (?P<expected_count>\d+|\.) (.*) (?P<skip_count>\d+|\.)'
r' (.*) (?P<expected_count>\d+|\.) (.*) (?P<skip_count>\d+|\.)'
r' (.*) (?P<duration>\d+(\.\d*)?|\.\d+)s', re.MULTILINE)
r' (.*) (?P<duration>\d+(\.\d*)?|\.\d+)s', re.MULTILINE)
PATH = os.environ['PATH']
PATH = '{{ prepend_path }}' + (PATH and ':' + PATH)
# NEO specific environment
# NEO specific environment
TEMP_DIRECTORY = '{{directory.tmp}}'
TEMP_DIRECTORY = '{{directory.tmp}}'
NEO_DB_SOCKET = '{{my_cnf_parameters.socket}}'
NEO_DB_SOCKET = '{{my_cnf_parameters.socket}}'
...
@@ -90,7 +93,8 @@ def main():
...
@@ -90,7 +93,8 @@ def main():
args = [RUN_NEO_TESTS_COMMAND, '-ufz']
args = [RUN_NEO_TESTS_COMMAND, '-ufz']
command = ' '.join(args)
command = ' '.join(args)
env = {'TEMP': temp,
env = {'PATH': PATH,
'TEMP': temp,
'NEO_TESTS_ADAPTER': adapter,
'NEO_TESTS_ADAPTER': adapter,
'NEO_TEST_ZODB_FUNCTIONAL': '1',
'NEO_TEST_ZODB_FUNCTIONAL': '1',
'NEO_DB_USER': 'root'}
'NEO_DB_USER': 'root'}
...
...
software/neoppod/software-common.cfg
View file @
c19f8286
...
@@ -105,7 +105,7 @@ md5sum = 1fee10f02c2fa2a581e21878ca0fd704
...
@@ -105,7 +105,7 @@ md5sum = 1fee10f02c2fa2a581e21878ca0fd704
[instance-neo-storage-mysql]
[instance-neo-storage-mysql]
<= download-base-neo
<= download-base-neo
md5sum =
366e51c0dbd85e511a31e403b8704735
md5sum =
25f099890c29763b463849293bc459ad
[template-neo-my-cnf]
[template-neo-my-cnf]
<= download-base-neo
<= download-base-neo
...
...
software/neoppod/software.cfg
View file @
c19f8286
...
@@ -26,7 +26,7 @@ md5sum = ee8401a4e7d82bf488a57e3399f9ce48
...
@@ -26,7 +26,7 @@ md5sum = ee8401a4e7d82bf488a57e3399f9ce48
[runTestSuite.in]
[runTestSuite.in]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:_buildout_section_name_}
url = ${:_profile_base_location_}/${:_buildout_section_name_}
md5sum =
982de37ea52c10938e46037adf2894c1
md5sum =
d8bba690cf950613d5576ff23813df59
[runTestSuite_py]
[runTestSuite_py]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
...
...
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