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
alecs_myu
erp5
Commits
0d2abbad
Commit
0d2abbad
authored
Aug 21, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testnode: remove hateoas_slapos_master_url parameter
parent
94168010
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
7 deletions
+2
-7
erp5/util/testnode/ScalabilityTestRunner.py
erp5/util/testnode/ScalabilityTestRunner.py
+1
-6
erp5/util/testnode/__init__.py
erp5/util/testnode/__init__.py
+1
-1
No files found.
erp5/util/testnode/ScalabilityTestRunner.py
View file @
0d2abbad
...
...
@@ -75,12 +75,7 @@ class ScalabilityTestRunner():
# Get Slapos Master url used for api rest (using hateoas)
self
.
slapos_api_rest_url
=
""
try
:
self
.
slapos_api_rest_url
=
self
.
testnode
.
test_suite_portal
.
getSlaposHateoasUrl
()
if
not
self
.
slapos_api_rest_url
:
self
.
slapos_api_rest_url
=
self
.
testnode
.
config
[
'hateoas_slapos_master_url'
]
except
:
self
.
slapos_api_rest_url
=
self
.
testnode
.
config
[
'hateoas_slapos_master_url'
]
self
.
slapos_api_rest_url
=
self
.
testnode
.
test_suite_portal
.
getSlaposHateoasUrl
()
...
...
erp5/util/testnode/__init__.py
View file @
0d2abbad
...
...
@@ -78,7 +78,7 @@ def main(*args):
'software_directory'
,
'proxy_port'
,
'git_binary'
,
'zip_binary'
,
'node_quantity'
,
'test_node_title'
,
'ipv4_address'
,
'ipv6_address'
,
'test_suite_master_url'
,
'
hateoas_slapos_master_url'
,
'
slapgrid_partition_binary'
,
'slapgrid_software_binary'
,
'slapgrid_partition_binary'
,
'slapgrid_software_binary'
,
'slapproxy_binary'
,
'httpd_ip'
,
'httpd_port'
,
'httpd_software_access_port'
,
'computer_id'
,
'server_url'
):
CONFIG
[
key
]
=
config
.
get
(
'testnode'
,
key
)
...
...
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