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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Joshua
erp5
Commits
308aa7fd
Commit
308aa7fd
authored
Jun 17, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename isValidatedMaster->isMasterTestnode (client side)
parent
d45e68c2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
erp5/tests/testERP5TestNode.py
erp5/tests/testERP5TestNode.py
+8
-8
erp5/util/taskdistribution/__init__.py
erp5/util/taskdistribution/__init__.py
+2
-2
erp5/util/testnode/ScalabilityTestRunner.py
erp5/util/testnode/ScalabilityTestRunner.py
+2
-2
No files found.
erp5/tests/testERP5TestNode.py
View file @
308aa7fd
...
...
@@ -478,7 +478,7 @@ branch = foo
return
'{"configuration_list": [], "involved_nodes_computer_guid"
\
: [], "error_message": "No error.", "launcher_nodes_computer_guid": {},
\
"launchable": false, "random_path" : "azertyuiop"}'
def
patch_is
ValidatedMaster
(
self
,
*
args
,
**
kw
):
def
patch_is
MasterTestnode
(
self
,
*
args
,
**
kw
):
return
(
grade
==
'master'
)
test_self
=
self
test_result_path_root
=
os
.
path
.
join
(
test_self
.
_temp_dir
,
'test/results'
)
...
...
@@ -540,11 +540,11 @@ branch = foo
original_getSlaposAccountKey
=
TaskDistributor
.
getSlaposAccountKey
original_getSlaposAccountCertificate
=
TaskDistributor
.
getSlaposAccountCertificate
original_generateConfiguration
=
TaskDistributor
.
generateConfiguration
original_is
ValidatedMaster
=
TaskDistributor
.
isValidatedMaster
original_is
MasterTestnode
=
TaskDistributor
.
isMasterTestnode
TaskDistributor
.
getSlaposAccountKey
=
patch_getSlaposAccountKey
TaskDistributor
.
getSlaposAccountCertificate
=
patch_getSlaposAccountCertificate
TaskDistributor
.
generateConfiguration
=
patch_generateConfiguration
TaskDistributor
.
is
ValidatedMaster
=
patch_isValidatedMaster
TaskDistributor
.
is
MasterTestnode
=
patch_isMasterTestnode
original_startTestSuite
=
TaskDistributor
.
startTestSuite
original_subscribeNode
=
TaskDistributor
.
subscribeNode
original_getTestType
=
TaskDistributor
.
getTestType
...
...
@@ -576,7 +576,7 @@ branch = foo
TaskDistributor
.
getSlaposAccountKey
=
original_getSlaposAccountKey
TaskDistributor
.
getSlaposAccountCertificate
=
original_getSlaposAccountCertificate
TaskDistributor
.
generateConfiguration
=
original_generateConfiguration
TaskDistributor
.
is
ValidatedMaster
=
original_isValidatedMaster
TaskDistributor
.
is
MasterTestnode
=
original_isMasterTestnode
TaskDistributor
.
startTestSuite
=
original_startTestSuite
TaskDistributionTool
.
createTestResult
=
original_createTestResult
TaskDistributionTool
.
subscribeNode
=
original_subscribeNode
...
...
@@ -635,7 +635,7 @@ branch = foo
return
'{"configuration_list": [], "involved_nodes_computer_guid"
\
: [], "error_message": "No error.", "launcher_nodes_computer_guid": {},
\
"launchable": false, "random_path" : "azertyuiop"}'
def
patch_is
ValidatedMaster
(
self
,
*
args
,
**
kw
):
def
patch_is
MasterTestnode
(
self
,
*
args
,
**
kw
):
return
(
grade
==
'master'
)
test_self
=
self
test_result_path_root
=
os
.
path
.
join
(
test_self
.
_temp_dir
,
'test/results'
)
...
...
@@ -686,11 +686,11 @@ branch = foo
original_getSlaposAccountKey
=
TaskDistributor
.
getSlaposAccountKey
original_getSlaposAccountCertificate
=
TaskDistributor
.
getSlaposAccountCertificate
original_generateConfiguration
=
TaskDistributor
.
generateConfiguration
original_is
ValidatedMaster
=
TaskDistributor
.
isValidatedMaster
original_is
MasterTestnode
=
TaskDistributor
.
isMasterTestnode
TaskDistributor
.
getSlaposAccountKey
=
patch_getSlaposAccountKey
TaskDistributor
.
getSlaposAccountCertificate
=
patch_getSlaposAccountCertificate
TaskDistributor
.
generateConfiguration
=
patch_generateConfiguration
TaskDistributor
.
is
ValidatedMaster
=
patch_isValidatedMaster
TaskDistributor
.
is
MasterTestnode
=
patch_isMasterTestnode
original_startTestSuite
=
TaskDistributor
.
startTestSuite
original_subscribeNode
=
TaskDistributor
.
subscribeNode
original_getTestType
=
TaskDistributor
.
getTestType
...
...
@@ -715,7 +715,7 @@ branch = foo
TaskDistributor
.
getSlaposAccountKey
=
original_getSlaposAccountKey
TaskDistributor
.
getSlaposAccountCertificate
=
original_getSlaposAccountCertificate
TaskDistributor
.
generateConfiguration
=
original_generateConfiguration
TaskDistributor
.
is
ValidatedMaster
=
original_isValidatedMaster
TaskDistributor
.
is
MasterTestnode
=
original_isMasterTestnode
TaskDistributor
.
startTestSuite
=
original_startTestSuite
TaskDistributionTool
.
createTestResult
=
original_createTestResult
TaskDistributionTool
.
subscribeNode
=
original_subscribeNode
...
...
erp5/util/taskdistribution/__init__.py
View file @
308aa7fd
...
...
@@ -469,11 +469,11 @@ class TaskDistributor(RPCRetry):
return
self
.
_retryRPC
(
'generateConfiguration'
,
(
test_suite_title
,))
def
is
ValidatedMaster
(
self
,
test_node_title
):
def
is
MasterTestnode
(
self
,
test_node_title
):
"""
Returns True or False if the testnode is the master
"""
return
self
.
_retryRPC
(
'is
ValidatedMaster
'
,
(
test_node_title
,))
return
self
.
_retryRPC
(
'is
MasterTestnode
'
,
(
test_node_title
,))
def
getSlaposAccountKey
(
self
):
"""
...
...
erp5/util/testnode/ScalabilityTestRunner.py
View file @
308aa7fd
...
...
@@ -86,7 +86,7 @@ class ScalabilityTestRunner():
"""
We will build slapos software needed by the testnode itself,
"""
if
self
.
testnode
.
test_suite_portal
.
is
ValidatedMaster
(
if
self
.
testnode
.
test_suite_portal
.
is
MasterTestnode
(
self
.
testnode
.
config
[
'test_node_title'
]):
pass
# software_path_list = []
...
...
@@ -143,7 +143,7 @@ class ScalabilityTestRunner():
interval_time
=
30
start_time
=
time
.
time
()
# Only master testnode must order software installation
if
self
.
testnode
.
test_suite_portal
.
is
ValidatedMaster
(
if
self
.
testnode
.
test_suite_portal
.
is
MasterTestnode
(
self
.
testnode
.
config
[
'test_node_title'
]):
# Get from ERP5 Master the configuration of the cluster for the test
test_configuration
=
testnodeUtils
.
deunicodeData
(
...
...
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