Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Eteri
slapos
Commits
7170e4a0
Commit
7170e4a0
authored
May 04, 2018
by
Eteri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
commit to check testnode
parent
6f3e2a41
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
software/erp5testnode/testsuite/fluentTest/instance-caddy-fluentd.cfg.in
...stnode/testsuite/fluentTest/instance-caddy-fluentd.cfg.in
+0
-1
software/erp5testnode/testsuite/fluentTest/software.cfg
software/erp5testnode/testsuite/fluentTest/software.cfg
+6
-3
software/erp5testnode/testsuite/fluentTest/tests/utils.py
software/erp5testnode/testsuite/fluentTest/tests/utils.py
+2
-2
No files found.
software/erp5testnode/testsuite/fluentTest/instance-caddy-fluentd.cfg.in
View file @
7170e4a0
...
@@ -109,7 +109,6 @@ command-line =
...
@@ -109,7 +109,6 @@ command-line =
${buildout:bin-directory}/runTestSuite
${buildout:bin-directory}/runTestSuite
--python_interpreter=${buildout:bin-directory}/${eggs:interpreter}
--python_interpreter=${buildout:bin-directory}/${eggs:interpreter}
--source_code_path_list=$${slapos:location}/software/erp5testnode/testsuite/fluentTest/tests/
--source_code_path_list=$${slapos:location}/software/erp5testnode/testsuite/fluentTest/tests/
environment =
environment =
PATH=${buildout:bin-directory}:/usr/bin/:/bin/
PATH=${buildout:bin-directory}:/usr/bin/:/bin/
LOCAL_IPV4=$${slap-network-information:local-ipv4}
LOCAL_IPV4=$${slap-network-information:local-ipv4}
...
...
software/erp5testnode/testsuite/fluentTest/software.cfg
View file @
7170e4a0
...
@@ -16,6 +16,8 @@ parts =
...
@@ -16,6 +16,8 @@ parts =
instance-profile
instance-profile
template-fluentdConfig
template-fluentdConfig
[setup-develop-egg]
[setup-develop-egg]
recipe = zc.recipe.egg:develop
recipe = zc.recipe.egg:develop
...
@@ -30,6 +32,7 @@ setup = ${slapos-repository:location}/software/erp5testnode/testsuite/fluentTest
...
@@ -30,6 +32,7 @@ setup = ${slapos-repository:location}/software/erp5testnode/testsuite/fluentTest
egg = erp5.util[testnode]
egg = erp5.util[testnode]
setup = ${erp5.util-repository:location}
setup = ${erp5.util-repository:location}
[eggs]
[eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs =
eggs =
...
@@ -95,7 +98,7 @@ mode = 0644
...
@@ -95,7 +98,7 @@ mode = 0644
[template-fluentdConfig]
[template-fluentdConfig]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/templates/fluentd-conf.cnf.in
url = ${:_profile_base_location_}/templates/fluentd-conf.cnf.in
#md5sum = 63b8bea7fcc18af68e8bdf2afc33a92d
md5sum = fd896793455e1d04082449212d285b55
filename = fluentd-conf.cnf.in
filename = fluentd-conf.cnf.in
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
mode = 0644
mode = 0644
...
@@ -131,7 +134,7 @@ mode = 0644
...
@@ -131,7 +134,7 @@ mode = 0644
[template-caddy-fluentd]
[template-caddy-fluentd]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-caddy-fluentd.cfg.in
url = ${:_profile_base_location_}/instance-caddy-fluentd.cfg.in
#md5sum = 0faafb57e55c6e1a310433c11e781133
md5sum = ee285ee5d2df708776d2b97a09499ef5
output = ${buildout:directory}/instance-caddy-fluentd.cfg.in
output = ${buildout:directory}/instance-caddy-fluentd.cfg.in
mode = 0644
mode = 0644
...
@@ -149,4 +152,4 @@ output = ${gowork:bin}/caddy
...
@@ -149,4 +152,4 @@ output = ${gowork:bin}/caddy
#versions]
#versions]
#slapos.recipe.template = 4.3
#slapos.recipe.template = 4.3
#erp5.util = 0.4.50
#erp5.util = 0.4.50
\ No newline at end of file
software/erp5testnode/testsuite/fluentTest/tests/utils.py
View file @
7170e4a0
...
@@ -127,7 +127,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -127,7 +127,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
software_status_dict
=
slapos_controler
.
runSoftwareRelease
(
config
,
environment
=
os
.
environ
)
software_status_dict
=
slapos_controler
.
runSoftwareRelease
(
config
,
environment
=
os
.
environ
)
# TODO: log more details in this case
# TODO: log more details in this case
assert
software_status_dict
[
'status_code'
]
==
0
#
assert software_status_dict['status_code'] == 0
instance_parameter_dict
=
cls
.
getInstanceParameterDict
()
instance_parameter_dict
=
cls
.
getInstanceParameterDict
()
instance_status_dict
=
slapos_controler
.
runComputerPartition
(
instance_status_dict
=
slapos_controler
.
runComputerPartition
(
...
@@ -135,7 +135,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -135,7 +135,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
cluster_configuration
=
instance_parameter_dict
,
cluster_configuration
=
instance_parameter_dict
,
environment
=
os
.
environ
)
environment
=
os
.
environ
)
# TODO: log more details in this case
# TODO: log more details in this case
assert
instance_status_dict
[
'status_code'
]
==
0
#
assert instance_status_dict['status_code'] == 0
# FIXME: similar to test node, only one (root) partition is really supported for now.
# FIXME: similar to test node, only one (root) partition is really supported for now.
computer_partition_list
=
[]
computer_partition_list
=
[]
...
...
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