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
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
erp5
Commits
13e6aac9
Commit
13e6aac9
authored
Jun 05, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add some changements to ScalabilityTestRunner
parent
bbf60fe0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
27 deletions
+21
-27
erp5/util/testnode/ScalabilityTestRunner.py
erp5/util/testnode/ScalabilityTestRunner.py
+21
-21
erp5/util/testnode/testnode.py
erp5/util/testnode/testnode.py
+0
-6
No files found.
erp5/util/testnode/ScalabilityTestRunner.py
View file @
13e6aac9
...
...
@@ -49,37 +49,35 @@ class ScalabilityTestRunner():
self
.
worker_nodes
=
[]
# may change between two test_suite
self
.
launcher_nodes
=
[]
# may change between two test_suite
self
.
master_nodes
=
[]
# doesn't change during all the test
self
.
slave_nodes
=
[]
# doesn't change during all the test
self
.
slave_nodes
=
[]
# doesn't change during all the test
def
_prepareSlapOS
(
self
,
software_path_list
):
def
_prepareSlapOS
(
*
args
,
**
kw
):
"""
Install softwares from list on all nodes wich are involved in the scalability test
A proxy to _supply : Install software a software on a specific node
"""
for
computer_guid
in
self
.
computer_guid_list
:
self
.
slapos_controler
.
initializeSlapOSControler
(
software_path_list
,
computer_guid
)
self
.
slapos_controler
.
_supply
(
*
args
,
**
kw
)
def
prepareSlapOSForTestNode
(
self
):
"""
Install softwares used to run tests (ex : launcher software)
Install
all
softwares used to run tests (ex : launcher software)
"""
for
computer_guid
in
self
.
launcher_nodes
[
'computer_id'
]:
self
.
slapos_controler
.
_supply
(
software_path_list
=
self
.
config
.
get
(
"software_list"
),
computer_guid
=
computer_guid
)
for
software_path
in
self
.
config
.
get
(
"software_list"
):
for
computer_guid
in
self
.
launcher_nodes
[
'computer_id'
]:
self
.
_prepareSlapOS
(
software_path
,
computer_guid
)
def
prepareSlapOSForTestSuite
(
self
,
software_path_list
):
def
_extractSoftwarePathList
(
self
,
node_test_suite
):
# TODO : write code
return
[]
def
prepareSlapOSForTestSuite
(
self
,
node_test_suite
):
"""
Install testsuite's softwares (on worker_nodes)
Install
all
testsuite's softwares (on worker_nodes)
"""
for
computer_guid
in
self
.
worker_nodes
[
'computer_id'
]:
self
.
slapos_controler
.
_supply
(
software_path_list
=
software_path_list
,
computer_guid
=
computer_guid
)
software_path_list
=
_extractSoftwarePathList
(
software_path_list
)
for
software_path
in
software_path_list
:
for
computer_guid
in
self
.
worker_nodes
[
'computer_id'
]:
self
.
_prepareSlapOS
(
software_path
,
computer_guid
)
def
_cleanUpNodesInformation
(
self
):
self
.
worker_nodes
=
[]
...
...
@@ -93,5 +91,7 @@ class ScalabilityTestRunner():
# And if it's not end ans invalidate everything and retry/reloop
def
runTestSuite
(
self
,
node_test_suite
,
portal_url
,
log
=
None
):
# TODO : write code
pass
erp5/util/testnode/testnode.py
View file @
13e6aac9
...
...
@@ -336,9 +336,6 @@ branch = %(branch)s
(
test_suite_data
,))
##/BLOCK OK
# Here we know what we are (sclability or unit test)
# self.prepareSlapOSForTestNode(test_node_slapos)
# Select the good runner
if
True
:
...
...
@@ -385,15 +382,12 @@ branch = %(branch)s
## /BLOCK OK
# Now prepare the installation of SlapOS and create instance
# status_dict = self.prepareSlapOSForTestSuite(node_test_suite)
status_dict
=
runner
.
prepareSlapOSForTestSuite
(
node_test_suite
)
# Give some time so computer partitions may start
# as partitions can be of any kind we have and likely will never have
# a reliable way to check if they are up or not ...
# time.sleep(20)
# self.runTestSuite(node_test_suite,portal_url)
# For scalability test runTestSuite is a big part
runner
.
runTestSuite
(
node_test_suite
,
portal_url
)
...
...
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