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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Eteri
slapos
Commits
aad98858
Commit
aad98858
authored
Nov 23, 2018
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
caddy-frontend: Control cp runs
parent
8134da57
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
software/caddy-frontend/test/test.py
software/caddy-frontend/test/test.py
+2
-1
software/caddy-frontend/test/utils.py
software/caddy-frontend/test/utils.py
+6
-2
software/erp5testnode/testsuite/caddy-frontend/software.cfg
software/erp5testnode/testsuite/caddy-frontend/software.cfg
+1
-2
No files found.
software/caddy-frontend/test/test.py
View file @
aad98858
...
@@ -385,7 +385,8 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
...
@@ -385,7 +385,8 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
partition_parameter_kw
=
partition_parameter_kw
,
partition_parameter_kw
=
partition_parameter_kw
,
shared
=
True
shared
=
True
)
)
cls
.
runComputerPartition
()
# run partition 4 more times for slaves to be setup
cls
.
runComputerPartition
(
max_quantity
=
4
)
for
slave_reference
,
partition_parameter_kw
in
cls
\
for
slave_reference
,
partition_parameter_kw
in
cls
\
.
getSlaveParameterDictDict
().
items
():
.
getSlaveParameterDictDict
().
items
():
slave_instance
=
request
(
slave_instance
=
request
(
...
...
software/caddy-frontend/test/utils.py
View file @
aad98858
...
@@ -260,7 +260,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -260,7 +260,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
@
classmethod
@
classmethod
def
runComputerPartition
(
cls
):
def
runComputerPartition
(
cls
,
max_quantity
=
None
):
"""Instanciate the software.
"""Instanciate the software.
This is the equivalent of doing:
This is the equivalent of doing:
...
@@ -272,6 +272,9 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -272,6 +272,9 @@ class SlapOSInstanceTestCase(unittest.TestCase):
This can be called by tests to simulate re-request with different parameters.
This can be called by tests to simulate re-request with different parameters.
"""
"""
run_cp_kw
=
{}
if
max_quantity
is
not
None
:
run_cp_kw
[
'max_quantity'
]
=
max_quantity
logger
=
logging
.
getLogger
()
logger
=
logging
.
getLogger
()
logger
.
level
=
logging
.
DEBUG
logger
.
level
=
logging
.
DEBUG
stream
=
StringIO
.
StringIO
()
stream
=
StringIO
.
StringIO
()
...
@@ -286,7 +289,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -286,7 +289,8 @@ class SlapOSInstanceTestCase(unittest.TestCase):
cls
.
instance_status_dict
=
cls
.
slapos_controler
.
runComputerPartition
(
cls
.
instance_status_dict
=
cls
.
slapos_controler
.
runComputerPartition
(
cls
.
config
,
cls
.
config
,
cluster_configuration
=
instance_parameter_dict
,
cluster_configuration
=
instance_parameter_dict
,
environment
=
os
.
environ
)
environment
=
os
.
environ
,
**
run_cp_kw
)
stream
.
seek
(
0
)
stream
.
seek
(
0
)
stream
.
flush
()
stream
.
flush
()
message
=
''
.
join
(
stream
.
readlines
()[
-
100
:])
message
=
''
.
join
(
stream
.
readlines
()[
-
100
:])
...
...
software/erp5testnode/testsuite/caddy-frontend/software.cfg
View file @
aad98858
...
@@ -54,8 +54,7 @@ branch = master
...
@@ -54,8 +54,7 @@ branch = master
[erp5.util-repository]
[erp5.util-repository]
<= git-clone-repository
<= git-clone-repository
repository = https://lab.nexedi.com/nexedi/erp5.git
repository = https://lab.nexedi.com/nexedi/erp5.git
revision = 69013fa0fb67501089c776ab5e75d7bbf2e0e3bc
revision = 55d7381c54a2e90aff2c4a88943883c35ea111de
branch = master
[configuration]
[configuration]
test_software_release = ${:_profile_base_location_}/../../../caddy-frontend/software.cfg
test_software_release = ${:_profile_base_location_}/../../../caddy-frontend/software.cfg
...
...
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