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
Yoji Takeuchi
erp5
Commits
c39caeaa
Commit
c39caeaa
authored
Dec 21, 2017
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testnode: more code clean up
parent
9669729e
Changes
6
Expand all
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 @
c39caeaa
import
unittest
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.ProcessManager
import
ProcessManager
,
SubprocessError
from
erp5.util.testnode.Updater
import
Updater
from
erp5.util.testnode.SlapOSMasterCommunicator
import
SlapOSMasterCommunicator
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.taskdistribution
import
TaskDistributor
...
...
@@ -56,14 +54,6 @@ class ERP5TestNode(TestCase):
print
"TESTNODE LOG : %r, %r"
%
(
arg
,
kw
)
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
):
shutil
.
rmtree
(
self
.
_temp_dir
,
True
)
...
...
@@ -127,7 +117,7 @@ class ERP5TestNode(TestCase):
"""
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
,
add_broken_repository
=
add_broken_repository
)[
0
])
...
...
@@ -188,8 +178,9 @@ class ERP5TestNode(TestCase):
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
self
.
assertEquals
(
0
,
node_test_suite
.
retry_software_count
)
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
)
node_test_suite
=
test_node
.
delNodeTestSuite
(
'foo'
)
del
test_node
.
node_test_suite_dict
[
'foo'
]
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
self
.
assertEquals
(
0
,
node_test_suite
.
retry_software_count
)
...
...
@@ -199,7 +190,6 @@ class ERP5TestNode(TestCase):
"""
test_node
=
self
.
getTestNode
()
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
node_test_suite
.
edit
(
working_directory
=
self
.
working_directory
)
self
.
assertEquals
(
"%s/foo"
%
self
.
working_directory
,
node_test_suite
.
working_directory
)
self
.
assertEquals
(
"%s/foo/test_suite"
%
self
.
working_directory
,
...
...
@@ -471,16 +461,16 @@ shared = true
test_node
=
self
.
getTestNode
()
test_suite_data
=
self
.
getTestSuiteData
(
add_third_repository
=
True
)
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
))
os
.
mkdir
(
os
.
path
.
join
(
self
.
working_directory
,
'foo'
))
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
))
os
.
mkdir
(
os
.
path
.
join
(
self
.
working_directory
,
'bar'
))
self
.
assertEquals
(
set
([
'bar'
,
'foo'
]),
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
))
def
test_09_runTestSuite
(
self
,
my_test_type
=
'UnitTest'
):
...
...
@@ -499,15 +489,13 @@ shared = true
test_node
=
self
.
getTestNode
()
test_node
.
process_manager
.
spawn
=
spawn
RunnerClass
=
self
.
returnGoodClassRunner
(
my_test_type
)
runner
=
self
.
returnGoodClassRunner
(
my_test_type
)(
test_node
)
slapos_controler
=
runner
.
_getSlapOSControler
(
self
.
working_directory
)
runner
=
test_type_registry
[
my_test_type
](
test_node
)
# Create and initialise/regenerate a nodetestsuite
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
self
.
updateNodeTestSuiteData
(
node_test_suite
)
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
.
close
(
os
.
open
(
path
,
os
.
O_CREAT
))
...
...
@@ -542,11 +530,9 @@ shared = true
def
test_10_prepareSlapOS
(
self
,
my_test_type
=
'UnitTest'
):
test_node
=
self
.
getTestNode
()
test_node_slapos
=
SlapOSInstance
()
RunnerClass
=
self
.
returnGoodClassRunner
(
my_test_type
)
runner
=
RunnerClass
(
test_node
)
test_node_slapos
=
SlapOSInstance
(
self
.
slapos_directory
)
runner
=
test_type_registry
[
my_test_type
](
test_node
)
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
node_test_suite
.
edit
(
working_directory
=
self
.
working_directory
)
status_dict
=
{
"status_code"
:
0
}
global
call_list
call_list
=
[]
...
...
@@ -660,7 +646,7 @@ shared = true
original_sleep
=
time
.
sleep
time
.
sleep
=
doNothing
self
.
generateTestRepositoryList
()
RunnerClass
=
self
.
returnGoodClassRunner
(
my_test_type
)
RunnerClass
=
test_type_registry
[
my_test_type
]
# Patch
if
my_test_type
==
"ScalabilityTest"
:
original_getSlaposAccountKey
=
TaskDistributor
.
getSlaposAccountKey
...
...
@@ -742,7 +728,6 @@ shared = true
def
test_14_createFolder
(
self
):
test_node
=
self
.
getTestNode
()
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
node_test_suite
.
edit
(
working_directory
=
self
.
working_directory
)
folder
=
node_test_suite
.
test_suite_directory
self
.
assertEquals
(
False
,
os
.
path
.
exists
(
folder
))
createFolder
(
folder
)
...
...
@@ -818,7 +803,7 @@ shared = true
self
.
assertEquals
(
1
,
len
([
x
for
x
in
suite_log
.
readlines
()
\
if
x
.
find
(
"Activated logfile"
)
>=
0
]))
RunnerClass
=
self
.
returnGoodClassRunner
(
my_test_type
)
RunnerClass
=
test_type_registry
[
my_test_type
]
original_sleep
=
time
.
sleep
time
.
sleep
=
doNothing
self
.
generateTestRepositoryList
()
...
...
@@ -938,8 +923,7 @@ shared = true
SlapOSControler
.
initializeSlapOSControler
initial_runSoftwareRelease
=
SlapOSControler
.
runSoftwareRelease
test_node
=
self
.
getTestNode
()
RunnerClass
=
self
.
returnGoodClassRunner
(
my_test_type
)
runner
=
RunnerClass
(
test_node
)
runner
=
test_type_registry
[
my_test_type
](
test_node
)
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
init_call_kw_list
=
[]
def
initializeSlapOSControler
(
self
,
**
kw
):
...
...
@@ -1045,7 +1029,7 @@ shared = true
os
.
makedirs
(
test_result_path_root
)
self
.
generateTestRepositoryList
()
# Select the good runner to modify
RunnerClass
=
self
.
returnGoodClassRunner
(
'ScalabilityTest'
)
RunnerClass
=
test_type_registry
[
'ScalabilityTest'
]
# Patch methods
original_sleep
=
time
.
sleep
original_getSlaposAccountKey
=
TaskDistributor
.
getSlaposAccountKey
...
...
erp5/util/testnode/NodeTestSuite.py
View file @
c39caeaa
...
...
@@ -37,38 +37,28 @@ class SlapOSInstance(object):
Base of an software instance,
store variables used during software installation
"""
def
__init__
(
self
):
def
__init__
(
self
,
working_directory
):
self
.
retry_software_count
=
0
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
):
"""
"""
def
__init__
(
self
,
reference
):
super
(
NodeTestSuite
,
self
).
__init__
()
def
__init__
(
self
,
reference
,
working_directory
):
d
=
os
.
path
.
join
(
working_directory
,
reference
)
super
(
NodeTestSuite
,
self
).
__init__
(
d
)
self
.
reference
=
reference
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
):
if
getattr
(
self
,
"working_directory"
,
None
)
is
not
None
:
if
not
(
self
.
working_directory
.
endswith
(
os
.
path
.
sep
+
self
.
reference
)):
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
:
def
edit
(
self
,
**
kw
):
self
.
__dict__
.
update
(
**
kw
)
for
vcs_repository
in
kw
.
get
(
'vcs_repository_list'
,
()):
buildout_section_id
=
vcs_repository
.
get
(
'buildout_section_id'
)
repository_id
=
buildout_section_id
or
\
vcs_repository
.
get
(
'url'
).
split
(
'/'
)[
-
1
].
split
(
'.'
)[
0
]
...
...
erp5/util/testnode/SlapOSControler.py
View file @
c39caeaa
...
...
@@ -99,12 +99,6 @@ class SlapOSControler(object):
else
:
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
,
software_configuration
=
None
,
computer_guid
=
None
,
state
=
'started'
):
"""
...
...
@@ -219,7 +213,7 @@ class SlapOSControler(object):
self
.
software_path_list
=
software_path_list
self
.
log
(
'SlapOSControler, initialize, reset_software: %r'
,
reset_software
)
config
=
self
.
config
slapos_config_dict
=
self
.
config
.
copy
()
slapos_config_dict
=
config
.
copy
()
slapos_config_dict
.
update
(
software_root
=
self
.
software_root
,
instance_root
=
self
.
instance_root
,
proxy_database
=
self
.
proxy_database
)
...
...
erp5/util/testnode/UnitTestRunner.py
View file @
c39caeaa
...
...
@@ -102,7 +102,7 @@ class UnitTestRunner(object):
# report-url, report-project and suite-url are required to seleniumrunner
# instance. This is a hack which must be removed.
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
,
software_path_list
=
config
.
get
(
"software_list"
),
cluster_configuration
=
{
...
...
@@ -120,14 +120,18 @@ class UnitTestRunner(object):
software_path_list
=
[
node_test_suite
.
custom_profile_path
],
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
):
config
=
self
.
testnode
.
config
slapos_controler
=
self
.
_getSlapOSControler
(
self
.
testnode
.
working_directory
)
run_test_suite_path_list
=
sorted
(
glob
.
glob
(
"%s/*/bin/runTestSuite"
%
\
slapos_controler
.
instance_root
))
if
not
len
(
run_test_suite_path_list
):
run_test_suite_path_list
=
glob
.
glob
(
self
.
getInstanceRoot
(
node_test_suite
)
+
"/*/bin/runTestSuite"
)
try
:
run_test_suite_path
=
min
(
run_test_suite_path_list
)
except
ValueError
:
raise
ValueError
(
'No runTestSuite provided in installed partitions.'
)
run_test_suite_path
=
run_test_suite_path_list
[
0
]
# Deal with Shebang size limitation
invocation_list
=
dealShebang
(
run_test_suite_path
)
invocation_list
+=
(
run_test_suite_path
,
...
...
erp5/util/testnode/__init__.py
View file @
c39caeaa
...
...
@@ -29,14 +29,8 @@ import argparse
import
logging
import
logging.handlers
import
os
import
pkg_resources
from
testnode
import
TestNode
CONFIG
=
{
'computer_id'
:
'COMPUTER'
,
'partition_reference'
:
'test0'
,
}
from
.testnode
import
TestNode
def
main
(
*
args
):
parser
=
argparse
.
ArgumentParser
()
...
...
@@ -54,6 +48,10 @@ def main(*args):
logging
.
basicConfig
(
level
=
logging
.
INFO
,
format
=
logger_format
)
logger
=
logging
.
getLogger
(
'erp5testnode'
)
CONFIG
=
{
'logger'
:
logger
.
info
,
'partition_reference'
:
'test0'
,
}
if
parsed_argument
.
console
or
parsed_argument
.
logfile
:
if
parsed_argument
.
console
:
logger
.
addHandler
(
logging
.
StreamHandler
())
...
...
@@ -64,11 +62,10 @@ def main(*args):
maxBytes
=
20000000
,
backupCount
=
4
)
file_handler
.
setFormatter
(
formatter
)
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
else
:
logger
.
addHandler
(
logging
.
NullHandler
())
CONFIG
[
'logger'
]
=
logger
.
info
config
=
ConfigParser
.
SafeConfigParser
()
# do not change case of option keys
config
.
optionxform
=
str
...
...
erp5/util/testnode/testnode.py
View file @
c39caeaa
This diff is collapsed.
Click to expand it.
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