Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ayush Tiwari
erp5
Commits
7b8c8034
Commit
7b8c8034
authored
Oct 31, 2012
by
Sebastien Robin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5testnode: add more unit tests and fixed some typo errors
parent
8c1cc8c0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
122 additions
and
32 deletions
+122
-32
erp5/tests/testERP5TestNode.py
erp5/tests/testERP5TestNode.py
+115
-25
erp5/util/testnode/testnode.py
erp5/util/testnode/testnode.py
+7
-7
No files found.
erp5/tests/testERP5TestNode.py
View file @
7b8c8034
...
@@ -48,21 +48,28 @@ class ERP5TestNode(TestCase):
...
@@ -48,21 +48,28 @@ class ERP5TestNode(TestCase):
for
arg
in
args
:
for
arg
in
args
:
print
"TESTNODE LOG : %r"
%
(
arg
,)
print
"TESTNODE LOG : %r"
%
(
arg
,)
# XXX how to get property the git path ?
# XXX how to get property the git path ?
config
=
{
"git_binary"
:
"/srv/slapgrid/slappart80/srv/runner/software/ba1e09f3364989dc92da955b64e72f8d/parts/git/bin/git"
}
config
=
{}
config
[
"git_binary"
]
=
"/srv/slapgrid/slappart80/srv/runner/software/ba1e09f3364989dc92da955b64e72f8d/parts/git/bin/git"
config
[
"working_directory"
]
=
self
.
working_directory
return
TestNode
(
log
,
config
)
return
TestNode
(
log
,
config
)
def
updateNodeTestSuiteData
(
self
,
node_test_suite
):
def
getTestSuiteData
(
self
):
node_test_suite
.
edit
(
working_directory
=
self
.
working_directory
,
return
[{
test_suite
=
"Foo"
,
"test_suite"
:
"Foo"
,
project_title
=
"Foo"
,
"project_title"
:
"Foo"
,
test_suite_title
=
"Foo-Test"
,
"test_suite_title"
:
"Foo-Test"
,
vcs_repository_list
=
[
"test_suite_reference"
:
"foo"
,
"vcs_repository_list"
:
[
{
'url'
:
self
.
remote_repository0
,
{
'url'
:
self
.
remote_repository0
,
'profile_path'
:
'software.cfg'
,
'profile_path'
:
'software.cfg'
,
'branch'
:
'master'
},
'branch'
:
'master'
},
{
'url'
:
self
.
remote_repository1
,
{
'url'
:
self
.
remote_repository1
,
'buildout_section_id'
:
'rep1'
,
'buildout_section_id'
:
'rep1'
,
'branch'
:
'master'
}])
'branch'
:
'master'
}]}]
def
updateNodeTestSuiteData
(
self
,
node_test_suite
):
node_test_suite
.
edit
(
working_directory
=
self
.
working_directory
,
**
self
.
getTestSuiteData
()[
0
])
def
getCaller
(
self
,
**
kw
):
def
getCaller
(
self
,
**
kw
):
class
Caller
(
object
):
class
Caller
(
object
):
...
@@ -75,7 +82,7 @@ class ERP5TestNode(TestCase):
...
@@ -75,7 +82,7 @@ class ERP5TestNode(TestCase):
return
Caller
(
**
kw
)
return
Caller
(
**
kw
)
def
generateTestRepositoryList
(
self
):
def
generateTestRepositoryList
(
self
):
last_commit_list
=
[]
commit_dict
=
{}
for
i
,
repository_path
in
enumerate
([
self
.
remote_repository0
,
for
i
,
repository_path
in
enumerate
([
self
.
remote_repository0
,
self
.
remote_repository1
]):
self
.
remote_repository1
]):
call
=
self
.
getCaller
(
cwd
=
repository_path
)
call
=
self
.
getCaller
(
cwd
=
repository_path
)
...
@@ -87,18 +94,21 @@ class ERP5TestNode(TestCase):
...
@@ -87,18 +94,21 @@ class ERP5TestNode(TestCase):
my_file
.
write
(
"initial_content%i"
%
i
)
my_file
.
write
(
"initial_content%i"
%
i
)
my_file
.
close
()
my_file
.
close
()
call
(
"git commit -av -m next_commit"
.
split
()
+
[
'--author="a b <a@b.c>"'
])
call
(
"git commit -av -m next_commit"
.
split
()
+
[
'--author="a b <a@b.c>"'
])
output
=
call
(
"git log --oneline"
.
split
()
)
output
=
call
(
[
'git'
,
'log'
,
'--format=%H %s'
]
)
output_line_list
=
output
.
split
(
"
\
n
"
)
output_line_list
=
output
.
split
(
"
\
n
"
)
self
.
assertEquals
(
3
,
len
(
output_line_list
))
self
.
assertEquals
(
3
,
len
(
output_line_list
))
# remove additional return line
# remove additional return line
output_line_list
=
output_line_list
[
0
:
2
]
output_line_list
=
output_line_list
[
0
:
2
]
expected_commit_list
=
[
"next_commit"
,
"first_commit"
]
expected_commit_subject_list
=
[
"next_commit"
,
"first_commit"
]
last_commit_list
.
append
(
output_line_list
[
0
].
split
())
commit_subject_list
=
[
x
.
split
()[
1
]
for
x
in
output_line_list
]
commit_list
=
[
x
.
split
()[
1
]
for
x
in
output_line_list
]
self
.
assertEquals
(
expected_commit_subject_list
,
commit_subject_list
)
self
.
assertEquals
(
expected_commit_list
,
commit_list
)
commit_dict
[
'rep%i'
%
i
]
=
[
x
.
split
()
for
x
in
output_line_list
]
# looks like [('d3d09e6', 'next_commit'), ('c4c15e0', 'next_commit')]
# commit_dict looks like
# for respectively rep0 and rep1
# {'rep1': [['6669613db7239c0b7f6e1fdb82af6f583dcb3a94', 'next_commit'],
return
last_commit_list
# ['4f1d14de1b04b4f878a442ee859791fa337bcf85', 'first_commit']],
# 'rep0': [['fb2a61882148d705fd10ecd87278b458a59920a9', 'next_commit'],
# ['4f1d14de1b04b4f878a442ee859791fa337bcf85', 'first_commit']]}
return
commit_dict
def
test_01_getDelNodeTestSuite
(
self
):
def
test_01_getDelNodeTestSuite
(
self
):
"""
"""
...
@@ -123,7 +133,23 @@ class ERP5TestNode(TestCase):
...
@@ -123,7 +133,23 @@ class ERP5TestNode(TestCase):
self
.
assertEquals
(
"%s/foo"
%
self
.
working_directory
,
self
.
assertEquals
(
"%s/foo"
%
self
.
working_directory
,
node_test_suite
.
working_directory
)
node_test_suite
.
working_directory
)
def
test_03_constructProfile
(
self
):
def
test_03_NodeTestSuiteCheckDataAfterEdit
(
self
):
"""
When a NodeTestSuite instance is edited, the method _checkData
analyse properties and add new ones
"""
test_node
=
self
.
getTestNode
()
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
self
.
updateNodeTestSuiteData
(
node_test_suite
)
self
.
assertEquals
(
2
,
len
(
node_test_suite
.
vcs_repository_list
))
repository_path_list
=
[]
for
vcs_repository
in
node_test_suite
.
vcs_repository_list
:
repository_path_list
.
append
(
vcs_repository
[
'repository_path'
])
expected_list
=
[
"%s/rep0"
%
node_test_suite
.
working_directory
,
"%s/rep1"
%
node_test_suite
.
working_directory
]
self
.
assertEquals
(
expected_list
,
repository_path_list
)
def
test_04_constructProfile
(
self
):
"""
"""
Check if the software profile is correctly generated
Check if the software profile is correctly generated
"""
"""
...
@@ -145,15 +171,79 @@ branch = master
...
@@ -145,15 +171,79 @@ branch = master
self
.
assertEquals
(
expected_profile
,
profile
.
read
())
self
.
assertEquals
(
expected_profile
,
profile
.
read
())
profile
.
close
()
profile
.
close
()
def
test_04_getAndUpdateFullRevisionList
(
self
):
def
test_05_getAndUpdateFullRevisionList
(
self
):
"""
Check if we clone correctly repositories and get right revisions
"""
commit_dict
=
self
.
generateTestRepositoryList
()
test_node
=
self
.
getTestNode
()
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
self
.
updateNodeTestSuiteData
(
node_test_suite
)
rev_list
=
test_node
.
getAndUpdateFullRevisionList
(
node_test_suite
)
self
.
assertEquals
(
2
,
len
(
rev_list
))
self
.
assertEquals
(
rev_list
[
0
],
'rep0=2-%s'
%
commit_dict
[
'rep0'
][
0
][
0
])
self
.
assertEquals
(
rev_list
[
1
],
'rep1=2-%s'
%
commit_dict
[
'rep1'
][
0
][
0
])
my_file
=
open
(
os
.
path
.
join
(
self
.
remote_repository1
,
'first_file'
),
'w'
)
my_file
.
write
(
"next_content"
)
my_file
.
close
()
call
=
self
.
getCaller
(
cwd
=
self
.
remote_repository1
)
call
(
"git commit -av -m new_commit"
.
split
()
+
[
'--author="a b <a@b.c>"'
])
rev_list
=
test_node
.
getAndUpdateFullRevisionList
(
node_test_suite
)
self
.
assertTrue
(
rev_list
[
0
].
startswith
(
'rep0=2-'
))
self
.
assertTrue
(
rev_list
[
1
].
startswith
(
'rep1=3-'
))
self
.
assertEquals
(
2
,
len
(
node_test_suite
.
vcs_repository_list
))
for
vcs_repository
in
node_test_suite
.
vcs_repository_list
:
self
.
assertTrue
(
os
.
path
.
exists
(
vcs_repository
[
'repository_path'
]))
def
test_06_checkRevision
(
self
):
"""
"""
Check if we
clone correctly repositories and git right revisions
Check if we
are able to restore older commit hash if master decide so
"""
"""
commit_
lis
t
=
self
.
generateTestRepositoryList
()
commit_
dic
t
=
self
.
generateTestRepositoryList
()
test_node
=
self
.
getTestNode
()
test_node
=
self
.
getTestNode
()
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
node_test_suite
=
test_node
.
getNodeTestSuite
(
'foo'
)
self
.
updateNodeTestSuiteData
(
node_test_suite
)
self
.
updateNodeTestSuiteData
(
node_test_suite
)
result
=
test_node
.
getAndUpdateFullRevisionList
(
node_test_suite
)
rev_list
=
test_node
.
getAndUpdateFullRevisionList
(
node_test_suite
)
self
.
assertEquals
(
2
,
len
(
result
))
def
getRepInfo
(
count
=
0
,
hash
=
0
):
self
.
assertTrue
(
result
[
0
].
startswith
(
'rep0=2-%s'
%
commit_list
[
0
][
0
]))
assert
count
or
hash
self
.
assertTrue
(
result
[
1
].
startswith
(
'rep1=2-%s'
%
commit_list
[
1
][
0
]))
info_list
=
[]
for
vcs_repository
in
node_test_suite
.
vcs_repository_list
:
call
=
self
.
getCaller
(
cwd
=
vcs_repository
[
'repository_path'
])
if
count
:
info_list
.
append
(
call
(
"git rev-list --topo-order --count HEAD"
.
split
()).
strip
())
if
hash
:
info_list
.
append
(
call
(
"git log -n1 --format=%H"
.
split
()).
strip
())
return
info_list
self
.
assertEquals
([
'2'
,
'2'
],
getRepInfo
(
count
=
1
))
self
.
assertEquals
([
commit_dict
[
'rep0'
][
0
][
0
],
commit_dict
[
'rep1'
][
0
][
0
]],
getRepInfo
(
hash
=
1
))
class
TestResult
(
object
):
pass
test_result
=
TestResult
()
# for test result to be one commit late for rep1 to force testnode to
# reset tree to older version
test_result
.
revision
=
'rep0=2-%s,rep1=1-%s'
%
(
commit_dict
[
'rep0'
][
0
][
0
],
commit_dict
[
'rep1'
][
1
][
0
])
test_node
.
checkRevision
(
test_result
,
node_test_suite
)
expected_count_list
=
[
'2'
,
'1'
]
self
.
assertEquals
([
'2'
,
'1'
],
getRepInfo
(
count
=
1
))
self
.
assertEquals
([
commit_dict
[
'rep0'
][
0
][
0
],
commit_dict
[
'rep1'
][
1
][
0
]],
getRepInfo
(
hash
=
1
))
def
test_07_checkOldTestSuite
(
self
):
test_node
=
self
.
getTestNode
()
test_suite_data
=
self
.
getTestSuiteData
()
self
.
assertEquals
([],
os
.
listdir
(
self
.
working_directory
))
test_node
.
checkOldTestSuite
(
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
.
checkOldTestSuite
(
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
.
checkOldTestSuite
(
test_suite_data
)
self
.
assertEquals
([
'foo'
],
os
.
listdir
(
self
.
working_directory
))
erp5/util/testnode/testnode.py
View file @
7b8c8034
...
@@ -99,7 +99,7 @@ class TestNode(object):
...
@@ -99,7 +99,7 @@ class TestNode(object):
# hack until slapos.cookbook is updated
# hack until slapos.cookbook is updated
if
self
.
config
.
get
(
'working_directory'
,
''
).
endswith
(
"slapos/"
):
if
self
.
config
.
get
(
'working_directory'
,
''
).
endswith
(
"slapos/"
):
self
.
config
[
'working_directory'
]
=
self
.
config
[
self
.
config
[
'working_directory'
]
=
self
.
config
[
'working_directory'
][:
-
(
len
(
"slapos/"
))]
+
"
/
testnode"
'working_directory'
][:
-
(
len
(
"slapos/"
))]
+
"testnode"
def
checkOldTestSuite
(
self
,
test_suite_data
):
def
checkOldTestSuite
(
self
,
test_suite_data
):
config
=
self
.
config
config
=
self
.
config
...
@@ -226,17 +226,17 @@ branch = %(branch)s
...
@@ -226,17 +226,17 @@ branch = %(branch)s
reset_software
=
slapos_instance
.
retry_software_count
>
10
reset_software
=
slapos_instance
.
retry_software_count
>
10
self
.
log
(
'testnode, retry_software_count : %r'
%
\
self
.
log
(
'testnode, retry_software_count : %r'
%
\
slapos_instance
.
retry_software_count
)
slapos_instance
.
retry_software_count
)
slapos_controler
=
SlapOSControler
.
SlapOSControler
(
s
elf
.
s
lapos_controler
=
SlapOSControler
.
SlapOSControler
(
working_directory
,
self
.
config
,
log
=
self
.
log
,
slapproxy_log
=
slapproxy_log
,
working_directory
,
self
.
config
,
log
=
self
.
log
,
slapproxy_log
=
slapproxy_log
,
process_manager
=
self
.
process_manager
,
reset_software
=
reset_software
,
process_manager
=
self
.
process_manager
,
reset_software
=
reset_software
,
software_path_list
=
software_path_list
)
software_path_list
=
software_path_list
)
self
.
process_manager
.
supervisord_pid_file
=
os
.
path
.
join
(
\
self
.
process_manager
.
supervisord_pid_file
=
os
.
path
.
join
(
\
slapos_controler
.
instance_root
,
'var'
,
'run'
,
'supervisord.pid'
)
s
elf
.
s
lapos_controler
.
instance_root
,
'var'
,
'run'
,
'supervisord.pid'
)
method_list
=
[
"runSoftwareRelease"
]
method_list
=
[
"runSoftwareRelease"
]
if
create_partition
:
if
create_partition
:
method_list
.
append
(
"runComputerPartition"
)
method_list
.
append
(
"runComputerPartition"
)
for
method_name
in
method_list
:
for
method_name
in
method_list
:
slapos_method
=
getattr
(
slapos_controler
,
method_name
)
slapos_method
=
getattr
(
s
elf
.
s
lapos_controler
,
method_name
)
status_dict
=
slapos_method
(
self
.
config
,
status_dict
=
slapos_method
(
self
.
config
,
environment
=
self
.
config
[
'environment'
],
environment
=
self
.
config
[
'environment'
],
)
)
...
@@ -269,11 +269,11 @@ branch = %(branch)s
...
@@ -269,11 +269,11 @@ branch = %(branch)s
invocation_list
=
line
[
2
:].
split
()
invocation_list
=
line
[
2
:].
split
()
return
invocation_list
return
invocation_list
def
runTestSuite
(
self
,
node_test_suite
,
portal_url
,
slapos_controler
):
def
runTestSuite
(
self
,
node_test_suite
,
portal_url
):
config
=
self
.
config
config
=
self
.
config
run_test_suite_path_list
=
glob
.
glob
(
"%s/*/bin/runTestSuite"
%
\
run_test_suite_path_list
=
glob
.
glob
(
"%s/*/bin/runTestSuite"
%
\
slapos_controler
.
instance_root
)
s
elf
.
s
lapos_controler
.
instance_root
)
if
not
len
(
run_test_suite_path_list
):
if
not
len
(
run_test_suite_path_list
):
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
]
run_test_suite_path
=
run_test_suite_path_list
[
0
]
...
@@ -368,7 +368,7 @@ branch = %(branch)s
...
@@ -368,7 +368,7 @@ branch = %(branch)s
# 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
)
self
.
runTestSuite
(
node_test_suite
,
portal_url
,
slapos_controler
)
self
.
runTestSuite
(
node_test_suite
,
portal_url
)
test_result
.
removeWatch
(
log_file_name
)
test_result
.
removeWatch
(
log_file_name
)
self
.
cleanUp
(
test_result
)
self
.
cleanUp
(
test_result
)
except
(
SubprocessError
,
CalledProcessError
)
as
e
:
except
(
SubprocessError
,
CalledProcessError
)
as
e
:
...
...
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