Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
2dc4bf14
Commit
2dc4bf14
authored
May 24, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow to select amount of parallel test databases.
parent
b33aeef6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
slapos/recipe/erp5/setup.py
slapos/recipe/erp5/setup.py
+1
-1
slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
+3
-2
No files found.
slapos/recipe/erp5/setup.py
View file @
2dc4bf14
...
@@ -6,7 +6,7 @@ from setuptools import setup, find_packages
...
@@ -6,7 +6,7 @@ from setuptools import setup, find_packages
# "."], stdout=subprocess.PIPE).communicate()[0]))
# "."], stdout=subprocess.PIPE).communicate()[0]))
name
=
"slapos.recipe.erp5"
name
=
"slapos.recipe.erp5"
version
=
'1.1-dev-18
1
'
version
=
'1.1-dev-18
2
'
def
read
(
name
):
def
read
(
name
):
return
open
(
name
).
read
()
return
open
(
name
).
read
()
...
...
slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
View file @
2dc4bf14
...
@@ -801,7 +801,8 @@ class Recipe(BaseSlapRecipe):
...
@@ -801,7 +801,8 @@ class Recipe(BaseSlapRecipe):
return
'https://[%(ip)s]:%(port)s'
%
apache_conf
return
'https://[%(ip)s]:%(port)s'
%
apache_conf
def
installMysqlServer
(
self
,
ip
,
port
,
database
=
'erp5'
,
user
=
'user'
,
def
installMysqlServer
(
self
,
ip
,
port
,
database
=
'erp5'
,
user
=
'user'
,
test_database
=
'test_erp5'
,
test_user
=
'test_user'
,
template_filename
=
None
):
test_database
=
'test_erp5'
,
test_user
=
'test_user'
,
template_filename
=
None
,
parallel_test_database_amount
=
100
):
backup_directory
=
self
.
createBackupDirectory
(
'mysql'
)
backup_directory
=
self
.
createBackupDirectory
(
'mysql'
)
if
template_filename
is
None
:
if
template_filename
is
None
:
template_filename
=
self
.
getTemplateFilename
(
'my.cnf.in'
)
template_filename
=
self
.
getTemplateFilename
(
'my.cnf.in'
)
...
@@ -824,7 +825,7 @@ class Recipe(BaseSlapRecipe):
...
@@ -824,7 +825,7 @@ class Recipe(BaseSlapRecipe):
mysql_test_user
=
test_user
,
mysql_test_user
=
test_user
,
mysql_parallel_test_dict
=
[
mysql_parallel_test_dict
=
[
(
'test_%i'
%
x
,)
*
2
+
(
self
.
generatePassword
(),)
\
(
'test_%i'
%
x
,)
*
2
+
(
self
.
generatePassword
(),)
\
for
x
in
xrange
(
0
,
100
)],
for
x
in
xrange
(
0
,
parallel_test_database_amount
)],
)
)
self
.
registerLogRotation
(
'mysql'
,
[
error_log
,
slow_query_log
],
self
.
registerLogRotation
(
'mysql'
,
[
error_log
,
slow_query_log
],
'%(mysql_binary)s --no-defaults -B --user=root '
'%(mysql_binary)s --no-defaults -B --user=root '
...
...
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