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
Frederic Thoma
erp5
Commits
db95cff8
Commit
db95cff8
authored
Jun 14, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug
parent
97fe2a29
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
4 deletions
+17
-4
erp5/tests/testERP5TestNode.py
erp5/tests/testERP5TestNode.py
+1
-1
erp5/util/testnode/ScalabilityTestRunner.py
erp5/util/testnode/ScalabilityTestRunner.py
+16
-0
erp5/util/testnode/SlapOSControler.py
erp5/util/testnode/SlapOSControler.py
+0
-3
No files found.
erp5/tests/testERP5TestNode.py
View file @
db95cff8
...
...
@@ -67,7 +67,7 @@ class ERP5TestNode(TestCase):
# XXX how to get property the git path ?
config
=
{}
config
[
"git_binary"
]
=
"git"
config
[
"slapos_directory"
]
=
self
.
working
_directory
config
[
"slapos_directory"
]
=
self
.
slapos
_directory
config
[
"working_directory"
]
=
self
.
working_directory
config
[
"node_quantity"
]
=
3
config
[
"test_suite_directory"
]
=
self
.
test_suite_directory
...
...
erp5/util/testnode/ScalabilityTestRunner.py
View file @
db95cff8
...
...
@@ -155,6 +155,22 @@ class ScalabilityTestRunner():
self
.
launchable
=
test_configuration
[
'launchable'
]
self
.
error_message
=
test_configuration
[
'error_message'
]
self
.
random_path
=
test_configuration
[
'random_path'
]
# create an obfuscated link to the testsuite directory
self
.
ofuscated_link_path
=
os
.
path
.
join
(
self
.
testnode
.
config
[
'link_to_testsuite_directory'
],
self
.
random_path
)
path_to_suite
=
os
.
path
.
join
(
self
.
testnode
.
config
[
'working_directory'
],
node_test_suite
.
reference
)
if
(
os
.
path
.
lexists
(
self
.
ofuscated_link_path
)
or
os
.
path
.
exists
(
self
.
ofuscated_link_path
)
)
:
os
.
remove
(
self
.
ofuscated_link_path
)
os
.
symlink
(
path_to_suite
,
self
.
ofuscated_link_path
)
if
not
self
.
launchable
:
self
.
testnode
.
log
(
"Test suite %s is not actually launchable with
\
the current cluster configuration."
%
(
node_test_suite
.
test_suite_title
,))
...
...
erp5/util/testnode/SlapOSControler.py
View file @
db95cff8
...
...
@@ -87,11 +87,8 @@ class SlapOSControler(object):
slapos_account_certificate_path
,
slapos_account_key_path
)
createFile
(
slapos_account_key_path
,
"w"
,
key
)
self
.
log
(
"%s created."
%
(
str
(
slapos_account_key_path
)))
createFile
(
slapos_account_certificate_path
,
"w"
,
certificate
)
self
.
log
(
"%s created."
%
(
str
(
slapos_account_certificate_path
)))
createFile
(
configuration_file_path
,
"w"
,
configuration_file_value
)
self
.
log
(
"%s created."
%
(
str
(
configuration_file_path
)))
self
.
configuration_file_path
=
configuration_file_path
def
supply
(
self
,
software_url
,
computer_id
,
state
=
"available"
):
...
...
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