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
Levin Zimmermann
erp5
Commits
eca30de0
Commit
eca30de0
authored
Nov 14, 2012
by
Pere Cortes
Committed by
Sebastien Robin
Nov 14, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5testnode: SlapOSControler's init issue fixed.
parent
b5cb3315
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
erp5/util/testnode/SlapOSControler.py
erp5/util/testnode/SlapOSControler.py
+8
-7
erp5/util/testnode/testnode.py
erp5/util/testnode/testnode.py
+4
-4
No files found.
erp5/util/testnode/SlapOSControler.py
View file @
eca30de0
...
@@ -42,19 +42,20 @@ def createFolder(folder):
...
@@ -42,19 +42,20 @@ def createFolder(folder):
class
SlapOSControler
(
object
):
class
SlapOSControler
(
object
):
def
__init__
(
self
,
working_directory
,
config
,
log
,
slapproxy_log
=
None
,
def
__init__
(
self
,
working_directory
,
config
):
process_manager
=
None
,
reset_software
=
False
,
software_path_list
=
None
):
self
.
software_path_list
=
software_path_list
log
(
'SlapOSControler, initialize, reset_software: %r'
%
reset_software
)
self
.
log
=
log
self
.
config
=
config
self
.
config
=
config
self
.
process_manager
=
process_manager
self
.
software_root
=
os
.
path
.
join
(
working_directory
,
'soft'
)
self
.
software_root
=
os
.
path
.
join
(
working_directory
,
'soft'
)
self
.
instance_root
=
os
.
path
.
join
(
working_directory
,
'inst'
)
self
.
instance_root
=
os
.
path
.
join
(
working_directory
,
'inst'
)
self
.
slapos_config
=
os
.
path
.
join
(
working_directory
,
'slapos.cfg'
)
self
.
slapos_config
=
os
.
path
.
join
(
working_directory
,
'slapos.cfg'
)
self
.
proxy_database
=
os
.
path
.
join
(
working_directory
,
'proxy.db'
)
self
.
proxy_database
=
os
.
path
.
join
(
working_directory
,
'proxy.db'
)
def
initializeSlapOSControler
(
self
):
def
initializeSlapOSControler
(
self
,
log
,
slapproxy_log
=
None
,
process_manager
=
None
,
reset_software
=
False
,
software_path_list
=
None
):
self
.
log
=
log
self
.
process_manager
=
process_manager
self
.
software_path_list
=
software_path_list
log
(
'SlapOSControler, initialize, reset_software: %r'
%
reset_software
)
config
=
self
.
config
slapos_config_dict
=
self
.
config
.
copy
()
slapos_config_dict
=
self
.
config
.
copy
()
slapos_config_dict
.
update
(
software_root
=
self
.
software_root
,
slapos_config_dict
.
update
(
software_root
=
self
.
software_root
,
instance_root
=
self
.
instance_root
,
instance_root
=
self
.
instance_root
,
...
...
erp5/util/testnode/testnode.py
View file @
eca30de0
...
@@ -230,10 +230,10 @@ branch = %(branch)s
...
@@ -230,10 +230,10 @@ branch = %(branch)s
self
.
log
(
'testnode, retry_software_count : %r'
%
\
self
.
log
(
'testnode, retry_software_count : %r'
%
\
slapos_instance
.
retry_software_count
)
slapos_instance
.
retry_software_count
)
self
.
slapos_controler
=
SlapOSControler
.
SlapOSControler
(
self
.
slapos_controler
=
SlapOSControler
.
SlapOSControler
(
working_directory
,
self
.
config
,
log
=
self
.
log
,
slapproxy_log
=
slapproxy_log
,
working_directory
,
self
.
config
)
process_manager
=
self
.
process_manager
,
reset_software
=
reset_software
,
self
.
slapos_controler
.
initializeSlapOSControler
(
log
=
self
.
log
,
slapproxy_log
=
slapproxy_log
,
software_path_list
=
software_path_list
)
process_manager
=
self
.
process_manager
,
reset_software
=
reset_software
,
self
.
slapos_controler
.
initializeSlapOSControler
(
)
software_path_list
=
software_path_list
)
self
.
process_manager
.
supervisord_pid_file
=
os
.
path
.
join
(
\
self
.
process_manager
.
supervisord_pid_file
=
os
.
path
.
join
(
\
self
.
slapos_controler
.
instance_root
,
'var'
,
'run'
,
'supervisord.pid'
)
self
.
slapos_controler
.
instance_root
,
'var'
,
'run'
,
'supervisord.pid'
)
method_list
=
[
"runSoftwareRelease"
]
method_list
=
[
"runSoftwareRelease"
]
...
...
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