def testBadToolchain(self):
"""Test that missing toolchains are detected"""
self.setupToolchains()
ret_code = self._RunControl('-b', TEST_BRANCH, '-o', self._output_dir)
lines = terminal.GetPrintTestLines()
# Buildman always builds the upstream commit as well
self.assertIn(
'Building %d commits for %d boards' % (self._commits, len(boards)),
lines[0].text)
self.assertEqual(self._builder.count, self._total_builds)
# Only sandbox should succeed, the others don't have toolchains
self.assertEqual(self._builder.fail,
self._total_builds - self._commits)
self.assertEqual(ret_code, 100)
for commit in range(self._commits):
for board in self._boards.GetList():
if board.arch != 'sandbox':
errfile = self._builder.GetErrFile(commit, board.target)
fd = open(errfile)
self.assertEqual(fd.readlines(),
['No tool chain for %s\n' % board.arch])
fd.close()
def testCurrentSource(self):
"""Very simple test to invoke buildman on the current source"""
self.setupToolchains()
self._RunControl('-o', self._output_dir)
lines = terminal.GetPrintTestLines()
self.assertIn('Building current source for %d boards' % len(boards),
lines[0].text)
def setUp(self):
self._base_dir = tempfile.mkdtemp()
self._output_dir = tempfile.mkdtemp()
self._git_dir = os.path.join(self._base_dir, 'src')
self._buildman_pathname = sys.argv[0]
self._buildman_dir = os.path.dirname(os.path.realpath(sys.argv[0]))
command.test_result = self._HandleCommand
self.setupToolchains()
self._toolchains.Add('arm-gcc', test=False)
self._toolchains.Add('powerpc-gcc', test=False)
bsettings.Setup(None)
bsettings.AddFile(settings_data)
self._boards = board.Boards()
for brd in boards:
self._boards.AddBoard(board.Board(*brd))
# Directories where the source been cloned
self._clone_dirs = []
self._commits = len(commit_shortlog.splitlines()) + 1
self._total_builds = self._commits * len(boards)
# Number of calls to make
self._make_calls = 0
# Map of [board, commit] to error messages
self._error = {}
self._test_branch = TEST_BRANCH
# Avoid sending any output and clear all terminal output
terminal.SetPrintTestMode()
terminal.GetPrintTestLines()
def _SetupTest(self, echo_lines=False, threads=1, **kwdisplay_args):
"""Set up the test by running a build and summary
Args:
echo_lines: True to echo lines to the terminal to aid test
development
kwdisplay_args: Dict of arguemnts to pass to
Builder.SetDisplayOptions()
Returns:
Iterator containing the output lines, each a PrintLine() object
"""
build = builder.Builder(self.toolchains,
self.base_dir,
None,
threads,
2,
checkout=False,
show_unknown=False)
build.do_make = self.Make
board_selected = self.boards.GetSelectedDict()
# Build the boards for the pre-defined commits and warnings/errors
# associated with each. This calls our Make() to inject the fake output.
build.BuildBoards(self.commits,
board_selected,
keep_outputs=False,
verbose=False)
lines = terminal.GetPrintTestLines()
count = 0
for line in lines:
if line.text.strip():
count += 1
# We should get two starting messages, an update for every commit built
# and a summary message
self.assertEqual(count, len(commits) * len(boards) + 3)
build.SetDisplayOptions(**kwdisplay_args)
build.ShowSummary(self.commits, board_selected)
if echo_lines:
terminal.EchoPrintTestLines()
return iter(terminal.GetPrintTestLines())
def testCreateBranch(self):
"""Test operation of create_branch()"""
repo = self.make_git_tree()
branch = 'first'
dest_branch = 'first2'
count = 2
gitdir = os.path.join(self.gitdir, '.git')
# Set up the test git tree. We use branch 'first' which has two commits
# in it
series = patchstream.get_metadata_for_list(branch, gitdir, count)
self.assertEqual(2, len(series.commits))
patch1 = status.Patch('1')
patch1.parse_subject('[1/2] %s' % series.commits[0].subject)
patch1.name = patch1.raw_subject
patch1.content = 'This is my patch content'
comment1a = {'content': 'Reviewed-by: %s\n' % self.joe}
patch1.comments = [comment1a]
patch2 = status.Patch('2')
patch2.parse_subject('[2/2] %s' % series.commits[1].subject)
patch2.name = patch2.raw_subject
patch2.content = 'Some other patch content'
comment2a = {
'content': 'Reviewed-by: %s\nTested-by: %s\n' %
(self.mary, self.leb)}
comment2b = {
'content': 'Reviewed-by: %s' % self.fred}
patch2.comments = [comment2a, comment2b]
# This test works by setting up patches for use by the fake Rest API
# function _fake_patchwork3(). The fake patch comments above should
# result in new review tags that are collected and added to the commits
# created in the destination branch.
self.patches = [patch1, patch2]
count = 2
# Expected output:
# 1 i2c: I2C things
# + Reviewed-by: Joe Bloggs <*****@*****.**>
# 2 spi: SPI fixes
# + Reviewed-by: Fred Bloggs <*****@*****.**>
# + Reviewed-by: Mary Bloggs <*****@*****.**>
# + Tested-by: Lord Edmund Blackaddër <*****@*****.**>
# 4 new responses available in patchwork
# 4 responses added from patchwork into new branch 'first2'
# <unittest.result.TestResult run=8 errors=0 failures=0>
terminal.SetPrintTestMode()
status.check_patchwork_status(series, '1234', branch, dest_branch,
False, False, None, self._fake_patchwork3,
repo)
lines = terminal.GetPrintTestLines()
self.assertEqual(12, len(lines))
self.assertEqual(
"4 responses added from patchwork into new branch 'first2'",
lines[11].text)
# Check that the destination branch has the new tags
new_series = patchstream.get_metadata_for_list(dest_branch, gitdir,
count)
self.assertEqual(
{'Reviewed-by': {self.joe}},
new_series.commits[0].rtags)
self.assertEqual(
{'Tested-by': {self.leb},
'Reviewed-by': {self.fred, self.mary}},
new_series.commits[1].rtags)
# Now check the actual test of the first commit message. We expect to
# see the new tags immediately below the old ones.
stdout = patchstream.get_list(dest_branch, count=count, git_dir=gitdir)
lines = iter([line.strip() for line in stdout.splitlines()
if '-by:' in line])
# First patch should have the review tag
self.assertEqual('Reviewed-by: %s' % self.joe, next(lines))
# Second patch should have the sign-off then the tested-by and two
# reviewed-by tags
self.assertEqual('Signed-off-by: %s' % self.leb, next(lines))
self.assertEqual('Reviewed-by: %s' % self.fred, next(lines))
self.assertEqual('Reviewed-by: %s' % self.mary, next(lines))
self.assertEqual('Tested-by: %s' % self.leb, next(lines))
def testFindNewResponses(self):
"""Test operation of find_new_responses()"""
commit1 = Commit('abcd')
commit1.subject = 'Subject 1'
commit2 = Commit('ef12')
commit2.subject = 'Subject 2'
patch1 = status.Patch('1')
patch1.parse_subject('[1/2] Subject 1')
patch1.name = patch1.raw_subject
patch1.content = 'This is my patch content'
comment1a = {'content': 'Reviewed-by: %s\n' % self.joe}
patch1.comments = [comment1a]
patch2 = status.Patch('2')
patch2.parse_subject('[2/2] Subject 2')
patch2.name = patch2.raw_subject
patch2.content = 'Some other patch content'
comment2a = {
'content': 'Reviewed-by: %s\nTested-by: %s\n' %
(self.mary, self.leb)}
comment2b = {'content': 'Reviewed-by: %s' % self.fred}
patch2.comments = [comment2a, comment2b]
# This test works by setting up commits and patch for use by the fake
# Rest API function _fake_patchwork2(). It calls various functions in
# the status module after setting up tags in the commits, checking that
# things behaves as expected
self.commits = [commit1, commit2]
self.patches = [patch1, patch2]
count = 2
new_rtag_list = [None] * count
review_list = [None, None]
# Check that the tags are picked up on the first patch
status.find_new_responses(new_rtag_list, review_list, 0, commit1,
patch1, None, self._fake_patchwork2)
self.assertEqual(new_rtag_list[0], {'Reviewed-by': {self.joe}})
# Now the second patch
status.find_new_responses(new_rtag_list, review_list, 1, commit2,
patch2, None, self._fake_patchwork2)
self.assertEqual(new_rtag_list[1], {
'Reviewed-by': {self.mary, self.fred},
'Tested-by': {self.leb}})
# Now add some tags to the commit, which means they should not appear as
# 'new' tags when scanning comments
new_rtag_list = [None] * count
commit1.rtags = {'Reviewed-by': {self.joe}}
status.find_new_responses(new_rtag_list, review_list, 0, commit1,
patch1, None, self._fake_patchwork2)
self.assertEqual(new_rtag_list[0], {})
# For the second commit, add Ed and Fred, so only Mary should be left
commit2.rtags = {
'Tested-by': {self.leb},
'Reviewed-by': {self.fred}}
status.find_new_responses(new_rtag_list, review_list, 1, commit2,
patch2, None, self._fake_patchwork2)
self.assertEqual(new_rtag_list[1], {'Reviewed-by': {self.mary}})
# Check that the output patches expectations:
# 1 Subject 1
# Reviewed-by: Joe Bloggs <*****@*****.**>
# 2 Subject 2
# Tested-by: Lord Edmund Blackaddër <*****@*****.**>
# Reviewed-by: Fred Bloggs <*****@*****.**>
# + Reviewed-by: Mary Bloggs <*****@*****.**>
# 1 new response available in patchwork
series = Series()
series.commits = [commit1, commit2]
terminal.SetPrintTestMode()
status.check_patchwork_status(series, '1234', None, None, False, False,
None, self._fake_patchwork2)
lines = iter(terminal.GetPrintTestLines())
col = terminal.Color()
self.assertEqual(terminal.PrintLine(' 1 Subject 1', col.BLUE),
next(lines))
self.assertEqual(
terminal.PrintLine(' Reviewed-by: ', col.GREEN, newline=False,
bright=False),
next(lines))
self.assertEqual(terminal.PrintLine(self.joe, col.WHITE, bright=False),
next(lines))
self.assertEqual(terminal.PrintLine(' 2 Subject 2', col.BLUE),
next(lines))
self.assertEqual(
terminal.PrintLine(' Reviewed-by: ', col.GREEN, newline=False,
bright=False),
next(lines))
self.assertEqual(terminal.PrintLine(self.fred, col.WHITE, bright=False),
next(lines))
self.assertEqual(
terminal.PrintLine(' Tested-by: ', col.GREEN, newline=False,
bright=False),
next(lines))
self.assertEqual(terminal.PrintLine(self.leb, col.WHITE, bright=False),
next(lines))
self.assertEqual(
terminal.PrintLine(' + Reviewed-by: ', col.GREEN, newline=False),
next(lines))
self.assertEqual(terminal.PrintLine(self.mary, col.WHITE),
next(lines))
self.assertEqual(terminal.PrintLine(
'1 new response available in patchwork (use -d to write them to a new branch)',
None), next(lines))
def testReviewSnippets(self):
"""Test showing of review snippets"""
def _to_submitter(who):
m_who = re.match('(.*) <(.*)>', who)
return {
'name': m_who.group(1),
'email': m_who.group(2)
}
commit1 = Commit('abcd')
commit1.subject = 'Subject 1'
commit2 = Commit('ef12')
commit2.subject = 'Subject 2'
patch1 = status.Patch('1')
patch1.parse_subject('[1/2] Subject 1')
patch1.name = patch1.raw_subject
patch1.content = 'This is my patch content'
comment1a = {'submitter': _to_submitter(self.joe),
'content': '''Hi Fred,
On some date Fred wrote:
> diff --git a/file.c b/file.c
> Some code
> and more code
Here is my comment above the above...
Reviewed-by: %s
''' % self.joe}
patch1.comments = [comment1a]
patch2 = status.Patch('2')
patch2.parse_subject('[2/2] Subject 2')
patch2.name = patch2.raw_subject
patch2.content = 'Some other patch content'
comment2a = {
'content': 'Reviewed-by: %s\nTested-by: %s\n' %
(self.mary, self.leb)}
comment2b = {'submitter': _to_submitter(self.fred),
'content': '''Hi Fred,
On some date Fred wrote:
> diff --git a/tools/patman/commit.py b/tools/patman/commit.py
> @@ -41,6 +41,9 @@ class Commit:
> self.rtags = collections.defaultdict(set)
> self.warn = []
>
> + def __str__(self):
> + return self.subject
> +
> def AddChange(self, version, info):
> """Add a new change line to the change list for a version.
>
A comment
Reviewed-by: %s
''' % self.fred}
patch2.comments = [comment2a, comment2b]
# This test works by setting up commits and patch for use by the fake
# Rest API function _fake_patchwork2(). It calls various functions in
# the status module after setting up tags in the commits, checking that
# things behaves as expected
self.commits = [commit1, commit2]
self.patches = [patch1, patch2]
# Check that the output patches expectations:
# 1 Subject 1
# Reviewed-by: Joe Bloggs <*****@*****.**>
# 2 Subject 2
# Tested-by: Lord Edmund Blackaddër <*****@*****.**>
# Reviewed-by: Fred Bloggs <*****@*****.**>
# + Reviewed-by: Mary Bloggs <*****@*****.**>
# 1 new response available in patchwork
series = Series()
series.commits = [commit1, commit2]
terminal.SetPrintTestMode()
status.check_patchwork_status(series, '1234', None, None, False, True,
None, self._fake_patchwork2)
lines = iter(terminal.GetPrintTestLines())
col = terminal.Color()
self.assertEqual(terminal.PrintLine(' 1 Subject 1', col.BLUE),
next(lines))
self.assertEqual(
terminal.PrintLine(' + Reviewed-by: ', col.GREEN, newline=False),
next(lines))
self.assertEqual(terminal.PrintLine(self.joe, col.WHITE), next(lines))
self.assertEqual(terminal.PrintLine('Review: %s' % self.joe, col.RED),
next(lines))
self.assertEqual(terminal.PrintLine(' Hi Fred,', None), next(lines))
self.assertEqual(terminal.PrintLine('', None), next(lines))
self.assertEqual(terminal.PrintLine(' > File: file.c', col.MAGENTA),
next(lines))
self.assertEqual(terminal.PrintLine(' > Some code', col.MAGENTA),
next(lines))
self.assertEqual(terminal.PrintLine(' > and more code', col.MAGENTA),
next(lines))
self.assertEqual(terminal.PrintLine(
' Here is my comment above the above...', None), next(lines))
self.assertEqual(terminal.PrintLine('', None), next(lines))
self.assertEqual(terminal.PrintLine(' 2 Subject 2', col.BLUE),
next(lines))
self.assertEqual(
terminal.PrintLine(' + Reviewed-by: ', col.GREEN, newline=False),
next(lines))
self.assertEqual(terminal.PrintLine(self.fred, col.WHITE),
next(lines))
self.assertEqual(
terminal.PrintLine(' + Reviewed-by: ', col.GREEN, newline=False),
next(lines))
self.assertEqual(terminal.PrintLine(self.mary, col.WHITE),
next(lines))
self.assertEqual(
terminal.PrintLine(' + Tested-by: ', col.GREEN, newline=False),
next(lines))
self.assertEqual(terminal.PrintLine(self.leb, col.WHITE),
next(lines))
self.assertEqual(terminal.PrintLine('Review: %s' % self.fred, col.RED),
next(lines))
self.assertEqual(terminal.PrintLine(' Hi Fred,', None), next(lines))
self.assertEqual(terminal.PrintLine('', None), next(lines))
self.assertEqual(terminal.PrintLine(
' > File: tools/patman/commit.py', col.MAGENTA), next(lines))
self.assertEqual(terminal.PrintLine(
' > Line: 41 / 41: class Commit:', col.MAGENTA), next(lines))
self.assertEqual(terminal.PrintLine(
' > + return self.subject', col.MAGENTA), next(lines))
self.assertEqual(terminal.PrintLine(
' > +', col.MAGENTA), next(lines))
self.assertEqual(
terminal.PrintLine(' > def AddChange(self, version, info):',
col.MAGENTA),
next(lines))
self.assertEqual(terminal.PrintLine(
' > """Add a new change line to the change list for a version.',
col.MAGENTA), next(lines))
self.assertEqual(terminal.PrintLine(
' >', col.MAGENTA), next(lines))
self.assertEqual(terminal.PrintLine(
' A comment', None), next(lines))
self.assertEqual(terminal.PrintLine('', None), next(lines))
self.assertEqual(terminal.PrintLine(
'4 new responses available in patchwork (use -d to write them to a new branch)',
None), next(lines))
