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
Alain Takoudjou
erp5
Commits
59122991
Commit
59122991
authored
Dec 21, 2017
by
Julien Muchembled
Committed by
Klaus Wölfel
Aug 28, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testnode: more code clean up
parent
438d1332
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
95 additions
and
139 deletions
+95
-139
erp5/tests/testERP5TestNode.py
erp5/tests/testERP5TestNode.py
+15
-31
erp5/util/testnode/NodeTestSuite.py
erp5/util/testnode/NodeTestSuite.py
+11
-21
erp5/util/testnode/SlapOSControler.py
erp5/util/testnode/SlapOSControler.py
+1
-7
erp5/util/testnode/UnitTestRunner.py
erp5/util/testnode/UnitTestRunner.py
+10
-6
erp5/util/testnode/__init__.py
erp5/util/testnode/__init__.py
+6
-9
erp5/util/testnode/testnode.py
erp5/util/testnode/testnode.py
+52
-65
No files found.
erp5/tests/testERP5TestNode.py
View file @
59122991
import
unittest
import
unittest
from
unittest
import
TestCase
from
unittest
import
TestCase
from
erp5.util.testnode.testnode
import
TestNode
from
erp5.util.testnode.testnode
import
TestNode
,
test_type_registry
from
erp5.util.testnode.NodeTestSuite
import
SlapOSInstance
,
NodeTestSuite
from
erp5.util.testnode.NodeTestSuite
import
SlapOSInstance
,
NodeTestSuite
from
erp5.util.testnode.ProcessManager
import
ProcessManager
,
SubprocessError
from
erp5.util.testnode.ProcessManager
import
ProcessManager
,
SubprocessError
from
erp5.util.testnode.Updater
import
Updater
from
erp5.util.testnode.Updater
import
Updater
from
erp5.util.testnode.SlapOSMasterCommunicator
import
SlapOSMasterCommunicator
from
erp5.util.testnode.SlapOSMasterCommunicator
import
SlapOSMasterCommunicator
from
erp5.util.testnode.SlapOSControler
import
SlapOSControler
from
erp5.util.testnode.SlapOSControler
import
SlapOSControler
from
erp5.util.testnode.UnitTestRunner
import
UnitTestRunner
from
erp5.util.testnode.ScalabilityTestRunner
import
ScalabilityTestRunner
from
erp5.util.testnode.SlapOSControler
import
createFolder
from
erp5.util.testnode.SlapOSControler
import
createFolder
from
erp5.util.taskdistribution
import
TaskDistributor
from
erp5.util.taskdistribution
import
TaskDistributor
...
@@ -56,14 +54,6 @@ class ERP5TestNode(TestCase):
...
@@ -56,14 +54,6 @@ class ERP5TestNode(TestCase):
print
"TESTNODE LOG : %r, %r"
%
(
arg
,
kw
)
print
"TESTNODE LOG : %r, %r"
%
(
arg
,
kw
)
self
.
log
=
log
self
.
log
=
log
def
returnGoodClassRunner
(
self
,
test_type
):
if
test_type
==
'UnitTest'
:
return
UnitTestRunner
elif
test_type
==
'ScalabilityTest'
:
return
ScalabilityTestRunner
else
:
raise
NotImplementedError
def
tearDown
(
self
):
def
tearDown
(
self
):
shutil
.
rmtree
(
self
.
_temp_dir
,
True
)
shutil
.
rmtree
(
self
.
_temp_dir
,
True
)
...
@@ -127,7 +117,7 @@ class ERP5TestNode(TestCase):
...
@@ -127,7 +117,7 @@ class ERP5TestNode(TestCase):
"""
"""
Update from zero/Regenerate the testsuite
Update from zero/Regenerate the testsuite
"""
"""
node_test_suite
.
edit
(
working_directory
=
self
.
working_directory
,
node_test_suite
.
edit
(
**
self
.
getTestSuiteData
(
add_third_repository
=
add_third_repository
,
**
self
.
getTestSuiteData
(
add_third_repository
=
add_third_repository
,
add_broken_repository
=
add_broken_repository
)[
0
])
add_broken_repository
=
add_broken_repository
)[
0
])
...
@@ -188,8 +178,9 @@ class ERP5TestNode(TestCase):
...
@@ -188,8 +178,9 @@ class ERP5TestNode(TestCase):
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
self
.
assertEquals
(
0
,
node_test_suite
.
retry_software_count
)
self
.
assertEquals
(
0
,
node_test_suite
.
retry_software_count
)
node_test_suite
.
retry_software_count
=
2
node_test_suite
.
retry_software_count
=
2
self
.
assertIs
(
node_test_suite
,
test_node
.
getNodeTestSuite
(
'foo'
))
self
.
assertEquals
(
2
,
node_test_suite
.
retry_software_count
)
self
.
assertEquals
(
2
,
node_test_suite
.
retry_software_count
)
node_test_suite
=
test_node
.
delNodeTestSuite
(
'foo'
)
del
test_node
.
node_test_suite_dict
[
'foo'
]
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
self
.
assertEquals
(
0
,
node_test_suite
.
retry_software_count
)
self
.
assertEquals
(
0
,
node_test_suite
.
retry_software_count
)
...
@@ -199,7 +190,6 @@ class ERP5TestNode(TestCase):
...
@@ -199,7 +190,6 @@ class ERP5TestNode(TestCase):
"""
"""
test_node
=
self
.
getTestNode
()
test_node
=
self
.
getTestNode
()
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
node_test_suite
.
edit
(
working_directory
=
self
.
working_directory
)
self
.
assertEquals
(
"%s/foo"
%
self
.
working_directory
,
self
.
assertEquals
(
"%s/foo"
%
self
.
working_directory
,
node_test_suite
.
working_directory
)
node_test_suite
.
working_directory
)
self
.
assertEquals
(
"%s/foo/test_suite"
%
self
.
working_directory
,
self
.
assertEquals
(
"%s/foo/test_suite"
%
self
.
working_directory
,
...
@@ -471,16 +461,16 @@ shared = true
...
@@ -471,16 +461,16 @@ shared = true
test_node
=
self
.
getTestNode
()
test_node
=
self
.
getTestNode
()
test_suite_data
=
self
.
getTestSuiteData
(
add_third_repository
=
True
)
test_suite_data
=
self
.
getTestSuiteData
(
add_third_repository
=
True
)
self
.
assertEquals
([],
os
.
listdir
(
self
.
working_directory
))
self
.
assertEquals
([],
os
.
listdir
(
self
.
working_directory
))
test_node
.
check
OldTestSuite
(
test_suite_data
)
test_node
.
purge
OldTestSuite
(
test_suite_data
)
self
.
assertEquals
([],
os
.
listdir
(
self
.
working_directory
))
self
.
assertEquals
([],
os
.
listdir
(
self
.
working_directory
))
os
.
mkdir
(
os
.
path
.
join
(
self
.
working_directory
,
'foo'
))
os
.
mkdir
(
os
.
path
.
join
(
self
.
working_directory
,
'foo'
))
self
.
assertEquals
([
'foo'
],
os
.
listdir
(
self
.
working_directory
))
self
.
assertEquals
([
'foo'
],
os
.
listdir
(
self
.
working_directory
))
test_node
.
check
OldTestSuite
(
test_suite_data
)
test_node
.
purge
OldTestSuite
(
test_suite_data
)
self
.
assertEquals
([
'foo'
],
os
.
listdir
(
self
.
working_directory
))
self
.
assertEquals
([
'foo'
],
os
.
listdir
(
self
.
working_directory
))
os
.
mkdir
(
os
.
path
.
join
(
self
.
working_directory
,
'bar'
))
os
.
mkdir
(
os
.
path
.
join
(
self
.
working_directory
,
'bar'
))
self
.
assertEquals
(
set
([
'bar'
,
'foo'
]),
self
.
assertEquals
(
set
([
'bar'
,
'foo'
]),
set
(
os
.
listdir
(
self
.
working_directory
)))
set
(
os
.
listdir
(
self
.
working_directory
)))
test_node
.
check
OldTestSuite
(
test_suite_data
)
test_node
.
purge
OldTestSuite
(
test_suite_data
)
self
.
assertEquals
([
'foo'
],
os
.
listdir
(
self
.
working_directory
))
self
.
assertEquals
([
'foo'
],
os
.
listdir
(
self
.
working_directory
))
def
test_09_runTestSuite
(
self
,
my_test_type
=
'UnitTest'
):
def
test_09_runTestSuite
(
self
,
my_test_type
=
'UnitTest'
):
...
@@ -499,15 +489,13 @@ shared = true
...
@@ -499,15 +489,13 @@ shared = true
test_node
=
self
.
getTestNode
()
test_node
=
self
.
getTestNode
()
test_node
.
process_manager
.
spawn
=
spawn
test_node
.
process_manager
.
spawn
=
spawn
RunnerClass
=
self
.
returnGoodClassRunner
(
my_test_type
)
runner
=
test_type_registry
[
my_test_type
](
test_node
)
runner
=
self
.
returnGoodClassRunner
(
my_test_type
)(
test_node
)
slapos_controler
=
runner
.
_getSlapOSControler
(
self
.
working_directory
)
# Create and initialise/regenerate a nodetestsuite
# Create and initialise/regenerate a nodetestsuite
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
self
.
updateNodeTestSuiteData
(
node_test_suite
)
self
.
updateNodeTestSuiteData
(
node_test_suite
)
node_test_suite
.
revision_list
=
(
'dummy'
,
(
0
,
''
)),
node_test_suite
.
revision_list
=
(
'dummy'
,
(
0
,
''
)),
path
=
slapos_controler
.
instance_root
+
'/a/bin/runTestSuite'
path
=
runner
.
getInstanceRoot
(
node_test_suite
)
+
'/a/bin/runTestSuite'
os
.
makedirs
(
os
.
path
.
dirname
(
path
))
os
.
makedirs
(
os
.
path
.
dirname
(
path
))
os
.
close
(
os
.
open
(
path
,
os
.
O_CREAT
))
os
.
close
(
os
.
open
(
path
,
os
.
O_CREAT
))
...
@@ -542,11 +530,9 @@ shared = true
...
@@ -542,11 +530,9 @@ shared = true
def
test_10_prepareSlapOS
(
self
,
my_test_type
=
'UnitTest'
):
def
test_10_prepareSlapOS
(
self
,
my_test_type
=
'UnitTest'
):
test_node
=
self
.
getTestNode
()
test_node
=
self
.
getTestNode
()
test_node_slapos
=
SlapOSInstance
()
test_node_slapos
=
SlapOSInstance
(
self
.
slapos_directory
)
RunnerClass
=
self
.
returnGoodClassRunner
(
my_test_type
)
runner
=
test_type_registry
[
my_test_type
](
test_node
)
runner
=
RunnerClass
(
test_node
)
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
node_test_suite
.
edit
(
working_directory
=
self
.
working_directory
)
status_dict
=
{
"status_code"
:
0
}
status_dict
=
{
"status_code"
:
0
}
global
call_list
global
call_list
call_list
=
[]
call_list
=
[]
...
@@ -660,7 +646,7 @@ shared = true
...
@@ -660,7 +646,7 @@ shared = true
original_sleep
=
time
.
sleep
original_sleep
=
time
.
sleep
time
.
sleep
=
doNothing
time
.
sleep
=
doNothing
self
.
generateTestRepositoryList
()
self
.
generateTestRepositoryList
()
RunnerClass
=
self
.
returnGoodClassRunner
(
my_test_type
)
RunnerClass
=
test_type_registry
[
my_test_type
]
# Patch
# Patch
if
my_test_type
==
"ScalabilityTest"
:
if
my_test_type
==
"ScalabilityTest"
:
original_getSlaposAccountKey
=
TaskDistributor
.
getSlaposAccountKey
original_getSlaposAccountKey
=
TaskDistributor
.
getSlaposAccountKey
...
@@ -742,7 +728,6 @@ shared = true
...
@@ -742,7 +728,6 @@ shared = true
def
test_14_createFolder
(
self
):
def
test_14_createFolder
(
self
):
test_node
=
self
.
getTestNode
()
test_node
=
self
.
getTestNode
()
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
node_test_suite
.
edit
(
working_directory
=
self
.
working_directory
)
folder
=
node_test_suite
.
test_suite_directory
folder
=
node_test_suite
.
test_suite_directory
self
.
assertEquals
(
False
,
os
.
path
.
exists
(
folder
))
self
.
assertEquals
(
False
,
os
.
path
.
exists
(
folder
))
createFolder
(
folder
)
createFolder
(
folder
)
...
@@ -818,7 +803,7 @@ shared = true
...
@@ -818,7 +803,7 @@ shared = true
self
.
assertEquals
(
1
,
len
([
x
for
x
in
suite_log
.
readlines
()
\
self
.
assertEquals
(
1
,
len
([
x
for
x
in
suite_log
.
readlines
()
\
if
x
.
find
(
"Activated logfile"
)
>=
0
]))
if
x
.
find
(
"Activated logfile"
)
>=
0
]))
RunnerClass
=
self
.
returnGoodClassRunner
(
my_test_type
)
RunnerClass
=
test_type_registry
[
my_test_type
]
original_sleep
=
time
.
sleep
original_sleep
=
time
.
sleep
time
.
sleep
=
doNothing
time
.
sleep
=
doNothing
self
.
generateTestRepositoryList
()
self
.
generateTestRepositoryList
()
...
@@ -938,8 +923,7 @@ shared = true
...
@@ -938,8 +923,7 @@ shared = true
SlapOSControler
.
initializeSlapOSControler
SlapOSControler
.
initializeSlapOSControler
initial_runSoftwareRelease
=
SlapOSControler
.
runSoftwareRelease
initial_runSoftwareRelease
=
SlapOSControler
.
runSoftwareRelease
test_node
=
self
.
getTestNode
()
test_node
=
self
.
getTestNode
()
RunnerClass
=
self
.
returnGoodClassRunner
(
my_test_type
)
runner
=
test_type_registry
[
my_test_type
](
test_node
)
runner
=
RunnerClass
(
test_node
)
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
init_call_kw_list
=
[]
init_call_kw_list
=
[]
def
initializeSlapOSControler
(
self
,
**
kw
):
def
initializeSlapOSControler
(
self
,
**
kw
):
...
@@ -1045,7 +1029,7 @@ shared = true
...
@@ -1045,7 +1029,7 @@ shared = true
os
.
makedirs
(
test_result_path_root
)
os
.
makedirs
(
test_result_path_root
)
self
.
generateTestRepositoryList
()
self
.
generateTestRepositoryList
()
# Select the good runner to modify
# Select the good runner to modify
RunnerClass
=
self
.
returnGoodClassRunner
(
'ScalabilityTest'
)
RunnerClass
=
test_type_registry
[
'ScalabilityTest'
]
# Patch methods
# Patch methods
original_sleep
=
time
.
sleep
original_sleep
=
time
.
sleep
original_getSlaposAccountKey
=
TaskDistributor
.
getSlaposAccountKey
original_getSlaposAccountKey
=
TaskDistributor
.
getSlaposAccountKey
...
...
erp5/util/testnode/NodeTestSuite.py
View file @
59122991
...
@@ -37,38 +37,28 @@ class SlapOSInstance(object):
...
@@ -37,38 +37,28 @@ class SlapOSInstance(object):
Base of an software instance,
Base of an software instance,
store variables used during software installation
store variables used during software installation
"""
"""
def
__init__
(
self
):
def
__init__
(
self
,
working_directory
):
self
.
retry_software_count
=
0
self
.
retry_software_count
=
0
self
.
retry
=
False
self
.
retry
=
False
self
.
working_directory
=
working_directory
def
edit
(
self
,
**
kw
):
self
.
__dict__
.
update
(
**
kw
)
self
.
_checkData
()
def
_checkData
(
self
):
pass
class
NodeTestSuite
(
SlapOSInstance
):
class
NodeTestSuite
(
SlapOSInstance
):
"""
"""
"""
"""
def
__init__
(
self
,
reference
):
def
__init__
(
self
,
reference
,
working_directory
):
super
(
NodeTestSuite
,
self
).
__init__
()
d
=
os
.
path
.
join
(
working_directory
,
reference
)
super
(
NodeTestSuite
,
self
).
__init__
(
d
)
self
.
reference
=
reference
self
.
reference
=
reference
self
.
cluster_configuration
=
{}
self
.
cluster_configuration
=
{}
self
.
test_suite_directory
=
os
.
path
.
join
(
d
,
'test_suite'
)
self
.
custom_profile_path
=
os
.
path
.
join
(
d
,
'software.cfg'
)
createFolder
(
d
)
def
_checkData
(
self
):
def
edit
(
self
,
**
kw
):
if
getattr
(
self
,
"working_directory"
,
None
)
is
not
None
:
self
.
__dict__
.
update
(
**
kw
)
if
not
(
self
.
working_directory
.
endswith
(
os
.
path
.
sep
+
self
.
reference
)):
for
vcs_repository
in
kw
.
get
(
'vcs_repository_list'
,
()):
self
.
working_directory
=
os
.
path
.
join
(
self
.
working_directory
,
self
.
reference
)
createFolder
(
self
.
working_directory
)
self
.
test_suite_directory
=
os
.
path
.
join
(
self
.
working_directory
,
"test_suite"
)
self
.
custom_profile_path
=
os
.
path
.
join
(
self
.
working_directory
,
'software.cfg'
)
if
getattr
(
self
,
"vcs_repository_list"
,
None
)
is
not
None
:
for
vcs_repository
in
self
.
vcs_repository_list
:
buildout_section_id
=
vcs_repository
.
get
(
'buildout_section_id'
)
buildout_section_id
=
vcs_repository
.
get
(
'buildout_section_id'
)
repository_id
=
buildout_section_id
or
\
repository_id
=
buildout_section_id
or
\
vcs_repository
.
get
(
'url'
).
split
(
'/'
)[
-
1
].
split
(
'.'
)[
0
]
vcs_repository
.
get
(
'url'
).
split
(
'/'
)[
-
1
].
split
(
'.'
)[
0
]
...
...
erp5/util/testnode/SlapOSControler.py
View file @
59122991
...
@@ -99,12 +99,6 @@ class SlapOSControler(object):
...
@@ -99,12 +99,6 @@ class SlapOSControler(object):
else
:
else
:
raise
ValueError
(
"Configuration file not found."
)
raise
ValueError
(
"Configuration file not found."
)
def
getInstanceRequestedState
(
self
,
reference
):
try
:
return
self
.
instance_config
[
reference
][
'requested_state'
]
except
Exception
:
raise
ValueError
(
"Instance '%s' not exist"
%
self
.
instance_config
[
reference
])
def
request
(
self
,
reference
,
software_url
,
software_type
=
None
,
def
request
(
self
,
reference
,
software_url
,
software_type
=
None
,
software_configuration
=
None
,
computer_guid
=
None
,
state
=
'started'
):
software_configuration
=
None
,
computer_guid
=
None
,
state
=
'started'
):
"""
"""
...
@@ -219,7 +213,7 @@ class SlapOSControler(object):
...
@@ -219,7 +213,7 @@ class SlapOSControler(object):
self
.
software_path_list
=
software_path_list
self
.
software_path_list
=
software_path_list
self
.
log
(
'SlapOSControler, initialize, reset_software: %r'
,
reset_software
)
self
.
log
(
'SlapOSControler, initialize, reset_software: %r'
,
reset_software
)
config
=
self
.
config
config
=
self
.
config
slapos_config_dict
=
self
.
config
.
copy
()
slapos_config_dict
=
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
,
proxy_database
=
self
.
proxy_database
)
proxy_database
=
self
.
proxy_database
)
...
...
erp5/util/testnode/UnitTestRunner.py
View file @
59122991
...
@@ -102,7 +102,7 @@ class UnitTestRunner(object):
...
@@ -102,7 +102,7 @@ class UnitTestRunner(object):
# report-url, report-project and suite-url are required to seleniumrunner
# report-url, report-project and suite-url are required to seleniumrunner
# instance. This is a hack which must be removed.
# instance. This is a hack which must be removed.
config
=
self
.
testnode
.
config
config
=
self
.
testnode
.
config
return
self
.
_prepareSlapOS
(
config
[
'slapos_directory'
]
,
return
self
.
_prepareSlapOS
(
test_node_slapos
.
working_directory
,
test_node_slapos
,
self
.
testnode
.
log
,
create_partition
=
0
,
test_node_slapos
,
self
.
testnode
.
log
,
create_partition
=
0
,
software_path_list
=
config
.
get
(
"software_list"
),
software_path_list
=
config
.
get
(
"software_list"
),
cluster_configuration
=
{
cluster_configuration
=
{
...
@@ -120,14 +120,18 @@ class UnitTestRunner(object):
...
@@ -120,14 +120,18 @@ class UnitTestRunner(object):
software_path_list
=
[
node_test_suite
.
custom_profile_path
],
software_path_list
=
[
node_test_suite
.
custom_profile_path
],
cluster_configuration
=
{
'_'
:
json
.
dumps
(
node_test_suite
.
cluster_configuration
)})
cluster_configuration
=
{
'_'
:
json
.
dumps
(
node_test_suite
.
cluster_configuration
)})
def
getInstanceRoot
(
self
,
node_test_suite
):
return
self
.
_getSlapOSControler
(
node_test_suite
.
working_directory
).
instance_root
def
runTestSuite
(
self
,
node_test_suite
,
portal_url
,
log
=
None
):
def
runTestSuite
(
self
,
node_test_suite
,
portal_url
,
log
=
None
):
config
=
self
.
testnode
.
config
config
=
self
.
testnode
.
config
slapos_controler
=
self
.
_getSlapOSControler
(
self
.
testnode
.
working_directory
)
run_test_suite_path_list
=
glob
.
glob
(
run_test_suite_path_list
=
sorted
(
glob
.
glob
(
"%s/*/bin/runTestSuite"
%
\
self
.
getInstanceRoot
(
node_test_suite
)
+
"/*/bin/runTestSuite"
)
slapos_controler
.
instance_root
))
try
:
if
not
len
(
run_test_suite_path_list
):
run_test_suite_path
=
min
(
run_test_suite_path_list
)
except
ValueError
:
raise
ValueError
(
'No runTestSuite provided in installed partitions.'
)
raise
ValueError
(
'No runTestSuite provided in installed partitions.'
)
run_test_suite_path
=
run_test_suite_path_list
[
0
]
# Deal with Shebang size limitation
# Deal with Shebang size limitation
invocation_list
=
dealShebang
(
run_test_suite_path
)
invocation_list
=
dealShebang
(
run_test_suite_path
)
invocation_list
+=
(
run_test_suite_path
,
invocation_list
+=
(
run_test_suite_path
,
...
...
erp5/util/testnode/__init__.py
View file @
59122991
...
@@ -29,14 +29,8 @@ import argparse
...
@@ -29,14 +29,8 @@ import argparse
import
logging
import
logging
import
logging.handlers
import
logging.handlers
import
os
import
os
import
pkg_resources
from
testnode
import
TestNode
from
.testnode
import
TestNode
CONFIG
=
{
'computer_id'
:
'COMPUTER'
,
'partition_reference'
:
'test0'
,
}
def
main
(
*
args
):
def
main
(
*
args
):
parser
=
argparse
.
ArgumentParser
()
parser
=
argparse
.
ArgumentParser
()
...
@@ -54,6 +48,10 @@ def main(*args):
...
@@ -54,6 +48,10 @@ def main(*args):
logging
.
basicConfig
(
level
=
logging
.
INFO
,
logging
.
basicConfig
(
level
=
logging
.
INFO
,
format
=
logger_format
)
format
=
logger_format
)
logger
=
logging
.
getLogger
(
'erp5testnode'
)
logger
=
logging
.
getLogger
(
'erp5testnode'
)
CONFIG
=
{
'logger'
:
logger
.
info
,
'partition_reference'
:
'test0'
,
}
if
parsed_argument
.
console
or
parsed_argument
.
logfile
:
if
parsed_argument
.
console
or
parsed_argument
.
logfile
:
if
parsed_argument
.
console
:
if
parsed_argument
.
console
:
logger
.
addHandler
(
logging
.
StreamHandler
())
logger
.
addHandler
(
logging
.
StreamHandler
())
...
@@ -64,11 +62,10 @@ def main(*args):
...
@@ -64,11 +62,10 @@ def main(*args):
maxBytes
=
20000000
,
backupCount
=
4
)
maxBytes
=
20000000
,
backupCount
=
4
)
file_handler
.
setFormatter
(
formatter
)
file_handler
.
setFormatter
(
formatter
)
logger
.
addHandler
(
file_handler
)
logger
.
addHandler
(
file_handler
)
logger
.
info
(
'Activated logfile %r output'
%
parsed_argument
.
logfile
)
logger
.
info
(
'Activated logfile %r output'
,
parsed_argument
.
logfile
)
CONFIG
[
'log_file'
]
=
parsed_argument
.
logfile
CONFIG
[
'log_file'
]
=
parsed_argument
.
logfile
else
:
else
:
logger
.
addHandler
(
logging
.
NullHandler
())
logger
.
addHandler
(
logging
.
NullHandler
())
CONFIG
[
'logger'
]
=
logger
.
info
config
=
ConfigParser
.
SafeConfigParser
()
config
=
ConfigParser
.
SafeConfigParser
()
# do not change case of option keys
# do not change case of option keys
config
.
optionxform
=
str
config
.
optionxform
=
str
...
...
erp5/util/testnode/testnode.py
View file @
59122991
...
@@ -53,6 +53,11 @@ class DummyLogger(object):
...
@@ -53,6 +53,11 @@ class DummyLogger(object):
'critical'
,
'fatal'
):
'critical'
,
'fatal'
):
setattr
(
self
,
name
,
func
)
setattr
(
self
,
name
,
func
)
test_type_registry
=
{
'UnitTest'
:
UnitTestRunner
,
'ScalabilityTest'
:
ScalabilityTestRunner
,
}
class
TestNode
(
object
):
class
TestNode
(
object
):
def
__init__
(
self
,
log
,
config
,
max_log_time
=
MAX_LOG_TIME
,
def
__init__
(
self
,
log
,
config
,
max_log_time
=
MAX_LOG_TIME
,
...
@@ -68,36 +73,29 @@ class TestNode(object):
...
@@ -68,36 +73,29 @@ class TestNode(object):
self
.
max_temp_time
=
max_temp_time
self
.
max_temp_time
=
max_temp_time
self
.
url_access
=
"https://[0::0]:0123"
# Ipv6 + port of the node
self
.
url_access
=
"https://[0::0]:0123"
# Ipv6 + port of the node
def
purgeOldTestSuite
(
self
,
test_suite_data
):
def
checkOldTestSuite
(
self
,
test_suite_data
):
reference_set
=
set
(
os
.
listdir
(
self
.
working_directory
))
installed_reference_set
=
set
(
os
.
listdir
(
self
.
working_directory
))
reference_set
.
difference_update
(
x
[
'test_suite_reference'
]
wished_reference_set
=
set
([
x
[
'test_suite_reference'
]
for
x
in
test_suite_data
])
for
x
in
test_suite_data
)
to_remove_reference_set
=
installed_reference_set
.
difference
(
for
reference
in
reference_set
:
wished_reference_set
)
fpath
=
os
.
path
.
join
(
self
.
working_directory
,
reference
)
for
y
in
to_remove_reference_set
:
self
.
node_test_suite_dict
.
pop
(
reference
,
None
)
fpath
=
os
.
path
.
join
(
self
.
working_directory
,
y
)
self
.
log
(
"testnode.purgeOldTestSuite, DELETING : %r"
,
fpath
)
self
.
delNodeTestSuite
(
y
)
self
.
log
(
"testnode.checkOldTestSuite, DELETING : %r"
,
fpath
)
if
os
.
path
.
isdir
(
fpath
):
if
os
.
path
.
isdir
(
fpath
):
shutil
.
rmtree
(
fpath
)
shutil
.
rmtree
(
fpath
)
else
:
else
:
os
.
remove
(
fpath
)
os
.
remove
(
fpath
)
def
getNodeTestSuite
(
self
,
reference
):
def
getNodeTestSuite
(
self
,
reference
):
node_test_suite
=
self
.
node_test_suite_dict
.
get
(
reference
)
try
:
if
node_test_suite
is
None
:
node_test_suite
=
self
.
node_test_suite_dict
[
reference
]
node_test_suite
=
NodeTestSuite
(
reference
)
except
KeyError
:
self
.
node_test_suite_dict
[
reference
]
=
node_test_suite
node_test_suite
=
self
.
node_test_suite_dict
[
reference
]
=
\
NodeTestSuite
(
reference
,
self
.
working_directory
)
node_test_suite
.
edit
(
config
=
self
.
config
log
=
self
.
log
,
node_test_suite
.
edit
(
log_directory
=
config
[
'log_directory'
])
config
=
self
.
config
,
process_manager
=
self
.
process_manager
)
return
node_test_suite
return
node_test_suite
def
delNodeTestSuite
(
self
,
reference
):
self
.
node_test_suite_dict
.
pop
(
reference
,
None
)
def
constructProfile
(
self
,
node_test_suite
,
test_type
,
use_relative_path
=
False
):
def
constructProfile
(
self
,
node_test_suite
,
test_type
,
use_relative_path
=
False
):
assert
len
(
node_test_suite
.
vcs_repository_list
),
"we must have at least one repository"
assert
len
(
node_test_suite
.
vcs_repository_list
),
"we must have at least one repository"
software_config_path
=
None
software_config_path
=
None
...
@@ -129,6 +127,10 @@ class TestNode(object):
...
@@ -129,6 +127,10 @@ class TestNode(object):
node_test_suite
.
reference
)
node_test_suite
.
reference
)
repository_path
=
os
.
path
.
relpath
(
repository_path
,
from_path
)
repository_path
=
os
.
path
.
relpath
(
repository_path
,
from_path
)
# XXX: Like in run(), code depending on specific test type must be
# moved to the test type classes. In particular, the use of a
# replacement pattern ('<obfuscated_url>') is ugly: buildout
# has cleaner ways to do that.
if
test_type
==
"ScalabilityTest"
:
if
test_type
==
"ScalabilityTest"
:
# <obfuscated_url> word is modified by in runner.prepareSlapOSForTestSuite()
# <obfuscated_url> word is modified by in runner.prepareSlapOSForTestSuite()
profile_content_list
.
append
(
"""
profile_content_list
.
append
(
"""
...
@@ -159,7 +161,6 @@ shared = true
...
@@ -159,7 +161,6 @@ shared = true
f
.
write
(
"[buildout]
\
n
extends = %s
\
n
%s"
%
(
f
.
write
(
"[buildout]
\
n
extends = %s
\
n
%s"
%
(
software_config_path
,
software_config_path
,
''
.
join
(
profile_content_list
)))
''
.
join
(
profile_content_list
)))
sys
.
path
.
append
(
repository_path
)
def
updateRevisionList
(
self
,
node_test_suite
):
def
updateRevisionList
(
self
,
node_test_suite
):
config
=
self
.
config
config
=
self
.
config
...
@@ -195,12 +196,9 @@ shared = true
...
@@ -195,12 +196,9 @@ shared = true
test_result
.
reportStatus
(
'LOG url'
,
"%s/%s"
%
(
self
.
config
.
get
(
'httpd_url'
),
test_result
.
reportStatus
(
'LOG url'
,
"%s/%s"
%
(
self
.
config
.
get
(
'httpd_url'
),
folder_id
),
''
)
folder_id
),
''
)
self
.
log
(
"going to switch to log %r"
,
suite_log_path
)
self
.
log
(
"going to switch to log %r"
,
suite_log_path
)
self
.
process_manager
.
log
=
self
.
log
=
self
.
getSuiteLog
()
self
.
process_manager
.
log
=
self
.
log
=
self
.
suite_log
return
suite_log_path
return
suite_log_path
def
getSuiteLog
(
self
):
return
self
.
suite_log
def
_initializeSuiteLog
(
self
,
suite_log_path
):
def
_initializeSuiteLog
(
self
,
suite_log_path
):
# remove previous handlers
# remove previous handlers
logger
=
logging
.
getLogger
(
'testsuite'
)
logger
=
logging
.
getLogger
(
'testsuite'
)
...
@@ -281,8 +279,8 @@ shared = true
...
@@ -281,8 +279,8 @@ shared = true
def
run
(
self
):
def
run
(
self
):
log
=
self
.
log
log
=
self
.
log
config
=
self
.
config
config
=
self
.
config
test_node_slapos
=
SlapOSInstance
()
portal_url
=
config
[
'test_suite_master_url'
]
test_node_slapos
.
edit
(
working_directory
=
config
[
'slapos_directory'
])
test_node_slapos
=
SlapOSInstance
(
config
[
'slapos_directory'
])
try
:
try
:
while
True
:
while
True
:
test_result
=
None
test_result
=
None
...
@@ -291,11 +289,11 @@ shared = true
...
@@ -291,11 +289,11 @@ shared = true
self
.
log
=
self
.
process_manager
.
log
=
self
.
testnode_log
self
.
log
=
self
.
process_manager
.
log
=
self
.
testnode_log
self
.
cleanUp
()
self
.
cleanUp
()
begin
=
time
.
time
()
begin
=
time
.
time
()
portal_url
=
config
[
'test_suite_master_url'
]
taskdistributor
=
taskdistribution
.
TaskDistributor
(
self
.
taskdistribution
=
taskdistribution
.
TaskDistributor
(
portal_url
,
logger
=
DummyLogger
(
log
))
portal_url
,
self
.
test_suite_portal
=
taskdistributor
# XXX ScalabilityTest
logger
=
DummyLogger
(
log
))
node_configuration
=
taskdistributor
.
subscribeNode
(
node_configuration
=
self
.
taskdistribution
.
subscribeNode
(
node_title
=
config
[
'test_node_title'
],
node_title
=
config
[
'test_node_title'
],
computer_guid
=
config
[
'computer_id'
])
computer_guid
=
config
[
'computer_id'
])
if
type
(
node_configuration
)
is
str
:
if
type
(
node_configuration
)
is
str
:
# Backward compatiblity
# Backward compatiblity
...
@@ -307,7 +305,7 @@ shared = true
...
@@ -307,7 +305,7 @@ shared = true
log
(
'Received and using process timeout from master: %i'
,
log
(
'Received and using process timeout from master: %i'
,
process_timeout
)
process_timeout
)
self
.
process_manager
.
max_timeout
=
process_timeout
self
.
process_manager
.
max_timeout
=
process_timeout
test_suite_data
=
self
.
taskdistribution
.
startTestSuite
(
test_suite_data
=
taskdistributor
.
startTestSuite
(
node_title
=
config
[
'test_node_title'
],
node_title
=
config
[
'test_node_title'
],
computer_guid
=
config
[
'computer_id'
])
computer_guid
=
config
[
'computer_id'
])
if
type
(
test_suite_data
)
is
str
:
if
type
(
test_suite_data
)
is
str
:
...
@@ -317,40 +315,27 @@ shared = true
...
@@ -317,40 +315,27 @@ shared = true
log
(
"Got following test suite data from master : %r"
,
log
(
"Got following test suite data from master : %r"
,
test_suite_data
)
test_suite_data
)
try
:
try
:
my_test_type
=
self
.
taskdistribution
.
getTestType
()
my_test_type
=
taskdistributor
.
getTestType
()
except
Exception
:
except
Exception
:
log
(
"testnode, error during requesting getTestType() method"
log
(
"testnode, error during requesting getTestType() method"
" from the distributor."
)
" from the distributor."
)
raise
raise
# Select runner according to the test type
# Select runner according to the test type
if
my_test_type
==
'UnitTest'
:
try
:
runner
=
UnitTestRunner
(
self
)
runner_class
=
test_type_registry
[
my_test_type
]
elif
my_test_type
==
'ScalabilityTest'
:
except
KeyError
:
runner
=
ScalabilityTestRunner
(
self
)
else
:
log
(
"testnode, Runner type %s not implemented."
,
my_test_type
)
log
(
"testnode, Runner type %s not implemented."
,
my_test_type
)
raise
NotImplementedError
raise
NotImplementedError
runner
=
runner_class
(
self
)
log
(
"Type of current test is %s"
,
my_test_type
)
log
(
"Type of current test is %s"
,
my_test_type
)
# master testnode gets test_suites, slaves get nothing
# master testnode gets test_suites, slaves get nothing
runner
.
prepareSlapOSForTestNode
(
test_node_slapos
)
runner
.
prepareSlapOSForTestNode
(
test_node_slapos
)
# Clean-up test suites
# Clean-up test suites
self
.
check
OldTestSuite
(
test_suite_data
)
self
.
purge
OldTestSuite
(
test_suite_data
)
for
test_suite
in
test_suite_data
:
for
test_suite
in
test_suite_data
:
node_test_suite
=
self
.
getNodeTestSuite
(
node_test_suite
=
self
.
getNodeTestSuite
(
test_suite
[
"test_suite_reference"
])
test_suite
.
pop
(
"test_suite_reference"
))
node_test_suite
.
edit
(
working_directory
=
config
[
'working_directory'
],
log_directory
=
config
[
'log_directory'
])
node_test_suite
.
edit
(
**
test_suite
)
node_test_suite
.
edit
(
**
test_suite
)
if
my_test_type
==
'UnitTest'
:
runner
=
UnitTestRunner
(
node_test_suite
)
elif
my_test_type
==
'ScalabilityTest'
:
runner
=
ScalabilityTestRunner
(
self
)
else
:
log
(
"testnode, Runner type %s not implemented."
,
my_test_type
)
raise
NotImplementedError
# XXX: temporary hack to prevent empty test_suite
# XXX: temporary hack to prevent empty test_suite
if
not
hasattr
(
node_test_suite
,
'test_suite'
):
if
not
hasattr
(
node_test_suite
,
'test_suite'
):
...
@@ -359,11 +344,7 @@ shared = true
...
@@ -359,11 +344,7 @@ shared = true
self
.
process_manager
.
killPreviousRun
()
self
.
process_manager
.
killPreviousRun
()
if
not
self
.
updateRevisionList
(
node_test_suite
):
if
not
self
.
updateRevisionList
(
node_test_suite
):
continue
continue
# Write our own software.cfg to use the local repository
test_result
=
taskdistributor
.
createTestResult
(
self
.
constructProfile
(
node_test_suite
,
my_test_type
,
runner
.
getRelativePathUsage
())
# Make sure we have local repository
test_result
=
self
.
taskdistribution
.
createTestResult
(
node_test_suite
.
revision
,
[],
node_test_suite
.
revision
,
[],
config
[
'test_node_title'
],
False
,
config
[
'test_node_title'
],
False
,
node_test_suite
.
test_suite_title
,
node_test_suite
.
test_suite_title
,
...
@@ -375,17 +356,23 @@ shared = true
...
@@ -375,17 +356,23 @@ shared = true
node_test_suite
.
edit
(
test_result
=
test_result
)
node_test_suite
.
edit
(
test_result
=
test_result
)
# get cluster configuration for this test suite, this is needed to
# get cluster configuration for this test suite, this is needed to
# know slapos parameters to user for creating instances
# know slapos parameters to user for creating instances
log
(
"Getting configuration from test suite %s"
,
node_test_suite
.
test_suite_title
)
log
(
"Getting configuration from test suite %s"
,
generated_config
=
self
.
taskdistribution
.
generateConfiguration
(
node_test_suite
.
test_suite_title
)
node_test_suite
.
test_suite_title
)
generated_config
=
taskdistributor
.
generateConfiguration
(
node_test_suite
.
test_suite_title
)
json_data
=
json
.
loads
(
generated_config
)
json_data
=
json
.
loads
(
generated_config
)
cluster_configuration
=
deunicodeData
(
json_data
[
'configuration_list'
][
0
])
cluster_configuration
=
deunicodeData
(
json_data
[
'configuration_list'
][
0
])
node_test_suite
.
edit
(
cluster_configuration
=
cluster_configuration
)
node_test_suite
.
edit
(
cluster_configuration
=
cluster_configuration
)
# Now prepare the installation of SlapOS and create instance
# Now prepare the installation of SlapOS and create instance
self
.
constructProfile
(
node_test_suite
,
my_test_type
,
runner
.
getRelativePathUsage
())
status_dict
=
runner
.
prepareSlapOSForTestSuite
(
node_test_suite
)
status_dict
=
runner
.
prepareSlapOSForTestSuite
(
node_test_suite
)
# Give some time so computer partitions may start
# Give some time so computer partitions may start
# as partitions can be of any kind we have and likely will never have
# as partitions can be of any kind we have and likely will never have
# a reliable way to check if they are up or not ...
# a reliable way to check if they are up or not ...
time
.
sleep
(
20
)
time
.
sleep
(
20
)
# XXX: Do not switch according to the test type. IOW, the
# following code must be moved to the test type class.
if
my_test_type
==
'UnitTest'
:
if
my_test_type
==
'UnitTest'
:
runner
.
runTestSuite
(
node_test_suite
,
portal_url
)
runner
.
runTestSuite
(
node_test_suite
,
portal_url
)
elif
my_test_type
==
'ScalabilityTest'
:
elif
my_test_type
==
'ScalabilityTest'
:
...
...
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