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
1
Issues
1
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
Roque
erp5
Commits
8a18779d
Commit
8a18779d
authored
Jun 17, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename random_path to randomized_path
parent
ac32c205
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
erp5/tests/testERP5TestNode.py
erp5/tests/testERP5TestNode.py
+2
-2
erp5/util/testnode/ScalabilityTestRunner.py
erp5/util/testnode/ScalabilityTestRunner.py
+5
-5
erp5/util/testnode/__init__.py
erp5/util/testnode/__init__.py
+2
-2
No files found.
erp5/tests/testERP5TestNode.py
View file @
8a18779d
...
@@ -477,7 +477,7 @@ branch = foo
...
@@ -477,7 +477,7 @@ branch = foo
def
patch_generateConfiguration
(
self
,
*
args
,
**
kw
):
def
patch_generateConfiguration
(
self
,
*
args
,
**
kw
):
return
'{"configuration_list": [], "involved_nodes_computer_guid"
\
return
'{"configuration_list": [], "involved_nodes_computer_guid"
\
: [], "error_message": "No error.", "launcher_nodes_computer_guid": {},
\
: [], "error_message": "No error.", "launcher_nodes_computer_guid": {},
\
"launchable": false, "random_path" : "azertyuiop"}'
"launchable": false, "random
ized
_path" : "azertyuiop"}'
def
patch_isMasterTestnode
(
self
,
*
args
,
**
kw
):
def
patch_isMasterTestnode
(
self
,
*
args
,
**
kw
):
return
(
grade
==
'master'
)
return
(
grade
==
'master'
)
test_self
=
self
test_self
=
self
...
@@ -634,7 +634,7 @@ branch = foo
...
@@ -634,7 +634,7 @@ branch = foo
def
patch_generateConfiguration
(
self
,
*
args
,
**
kw
):
def
patch_generateConfiguration
(
self
,
*
args
,
**
kw
):
return
'{"configuration_list": [], "involved_nodes_computer_guid"
\
return
'{"configuration_list": [], "involved_nodes_computer_guid"
\
: [], "error_message": "No error.", "launcher_nodes_computer_guid": {},
\
: [], "error_message": "No error.", "launcher_nodes_computer_guid": {},
\
"launchable": false, "random_path" : "azertyuiop"}'
"launchable": false, "random
ized
_path" : "azertyuiop"}'
def
patch_isMasterTestnode
(
self
,
*
args
,
**
kw
):
def
patch_isMasterTestnode
(
self
,
*
args
,
**
kw
):
return
(
grade
==
'master'
)
return
(
grade
==
'master'
)
test_self
=
self
test_self
=
self
...
...
erp5/util/testnode/ScalabilityTestRunner.py
View file @
8a18779d
...
@@ -156,7 +156,7 @@ class ScalabilityTestRunner():
...
@@ -156,7 +156,7 @@ class ScalabilityTestRunner():
self
.
involved_nodes_computer_guid
=
test_configuration
[
'involved_nodes_computer_guid'
]
self
.
involved_nodes_computer_guid
=
test_configuration
[
'involved_nodes_computer_guid'
]
self
.
launchable
=
test_configuration
[
'launchable'
]
self
.
launchable
=
test_configuration
[
'launchable'
]
self
.
error_message
=
test_configuration
[
'error_message'
]
self
.
error_message
=
test_configuration
[
'error_message'
]
self
.
random
_path
=
test_configuration
[
'random
_path'
]
self
.
random
ized_path
=
test_configuration
[
'randomized
_path'
]
# Avoid the test if it is not launchable
# Avoid the test if it is not launchable
if
not
self
.
launchable
:
if
not
self
.
launchable
:
...
@@ -169,8 +169,8 @@ class ScalabilityTestRunner():
...
@@ -169,8 +169,8 @@ class ScalabilityTestRunner():
# create an obfuscated link to the testsuite directory
# create an obfuscated link to the testsuite directory
self
.
testnode
.
log
(
"self.testnode.config['software_directory']
\
self
.
testnode
.
log
(
"self.testnode.config['software_directory']
\
: %s"
%
(
self
.
testnode
.
config
[
'software_directory'
]))
: %s"
%
(
self
.
testnode
.
config
[
'software_directory'
]))
self
.
testnode
.
log
(
"self.random_path
\
self
.
testnode
.
log
(
"self.random
ized
_path
\
: %s"
%
(
self
.
random_path
))
: %s"
%
(
self
.
random
ized
_path
))
path_to_suite
=
os
.
path
.
join
(
path_to_suite
=
os
.
path
.
join
(
self
.
testnode
.
config
[
'working_directory'
],
self
.
testnode
.
config
[
'working_directory'
],
node_test_suite
.
reference
)
node_test_suite
.
reference
)
...
@@ -178,7 +178,7 @@ class ScalabilityTestRunner():
...
@@ -178,7 +178,7 @@ class ScalabilityTestRunner():
: %s"
%
(
path_to_suite
))
: %s"
%
(
path_to_suite
))
self
.
ofuscated_link_path
=
os
.
path
.
join
(
self
.
ofuscated_link_path
=
os
.
path
.
join
(
self
.
testnode
.
config
[
'software_directory'
],
self
.
testnode
.
config
[
'software_directory'
],
self
.
random_path
)
self
.
random
ized
_path
)
if
(
not
os
.
path
.
lexists
(
self
.
ofuscated_link_path
)
and
if
(
not
os
.
path
.
lexists
(
self
.
ofuscated_link_path
)
and
os
.
path
.
exists
(
self
.
ofuscated_link_path
)
)
:
os
.
path
.
exists
(
self
.
ofuscated_link_path
)
)
:
try
:
try
:
...
@@ -196,7 +196,7 @@ class ScalabilityTestRunner():
...
@@ -196,7 +196,7 @@ class ScalabilityTestRunner():
# Construct the ipv6 obfuscated url of the software profile reachable from outside
# Construct the ipv6 obfuscated url of the software profile reachable from outside
self
.
reachable_profile
=
os
.
path
.
join
(
self
.
reachable_profile
=
os
.
path
.
join
(
"https://"
,
"["
+
self
.
testnode
.
config
[
'httpd_ip'
]
+
"]"
+
":"
+
self
.
testnode
.
config
[
'httpd_software_access_port'
],
"https://"
,
"["
+
self
.
testnode
.
config
[
'httpd_ip'
]
+
"]"
+
":"
+
self
.
testnode
.
config
[
'httpd_software_access_port'
],
self
.
random_path
,
"software.cfg"
)
self
.
random
ized
_path
,
"software.cfg"
)
self
.
testnode
.
log
(
"Software reachable profile path is : %s "
self
.
testnode
.
log
(
"Software reachable profile path is : %s "
%
(
self
.
reachable_profile
,))
%
(
self
.
reachable_profile
,))
software_path_list
.
append
(
self
.
reachable_profile
)
software_path_list
.
append
(
self
.
reachable_profile
)
...
...
erp5/util/testnode/__init__.py
View file @
8a18779d
...
@@ -79,8 +79,8 @@ def main(*args):
...
@@ -79,8 +79,8 @@ def main(*args):
'proxy_port'
,
'git_binary'
,
'zip_binary'
,
'node_quantity'
,
'proxy_port'
,
'git_binary'
,
'zip_binary'
,
'node_quantity'
,
'test_node_title'
,
'ipv4_address'
,
'ipv6_address'
,
'test_suite_master_url'
,
'test_node_title'
,
'ipv4_address'
,
'ipv6_address'
,
'test_suite_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'
,
'slapproxy_binary'
,
'httpd_ip'
,
'httpd_port'
,
'httpd_software_access_port'
,
'server_url'
):
'
computer_id'
,
'
server_url'
):
CONFIG
[
key
]
=
config
.
get
(
'testnode'
,
key
)
CONFIG
[
key
]
=
config
.
get
(
'testnode'
,
key
)
for
key
in
(
'slapos_directory'
,
'working_directory'
,
'test_suite_directory'
,
for
key
in
(
'slapos_directory'
,
'working_directory'
,
'test_suite_directory'
,
...
...
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