diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/dtoc/test_fdt.py | 2 | ||||
| -rw-r--r-- | tools/patman/func_test.py | 23 | ||||
| -rw-r--r-- | tools/patman/patchstream.py | 7 |
3 files changed, 29 insertions, 3 deletions
diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py index 1119e6b784..d104f3c774 100755 --- a/tools/dtoc/test_fdt.py +++ b/tools/dtoc/test_fdt.py @@ -425,7 +425,7 @@ class TestProp(unittest.TestCase): # Widen an array of ints with an int (should do nothing) prop = self.node.props['intarray'] - prop2 = node2.props['intarray'] + prop2 = node2.props['intval'] self.assertEqual(Type.INT, prop.type) self.assertEqual(3, len(prop.value)) prop.Widen(prop2) diff --git a/tools/patman/func_test.py b/tools/patman/func_test.py index 9871bb580d..2493e527f5 100644 --- a/tools/patman/func_test.py +++ b/tools/patman/func_test.py @@ -136,7 +136,7 @@ class TestFunctional(unittest.TestCase): Commit-changes: 2 - Changes only for this commit - Cover-changes: 4 +' Cover-changes: 4 - Some notes for the cover letter Cover-letter: @@ -1293,3 +1293,24 @@ Reviewed-by: %s self.assertEqual(terminal.PrintLine( '4 new responses available in patchwork (use -d to write them to a new branch)', None), next(lines)) + + def testInsertTags(self): + """Test inserting of review tags""" + msg = '''first line +second line.''' + tags = [ + 'Reviewed-by: Bin Meng <bmeng.cn@gmail.com>', + 'Tested-by: Bin Meng <bmeng.cn@gmail.com>' + ] + signoff = 'Signed-off-by: Simon Glass <sjg@chromium.com>' + tag_str = '\n'.join(tags) + + new_msg = patchstream.insert_tags(msg, tags) + self.assertEqual(msg + '\n\n' + tag_str, new_msg) + + new_msg = patchstream.insert_tags(msg + '\n', tags) + self.assertEqual(msg + '\n\n' + tag_str, new_msg) + + msg += '\n\n' + signoff + new_msg = patchstream.insert_tags(msg, tags) + self.assertEqual(msg + '\n' + tag_str, new_msg) diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index b960292427..2439fb18e4 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -662,6 +662,7 @@ def insert_tags(msg, tags_to_emit): out = [] done = False emit_tags = False + emit_blank = False for line in msg.splitlines(): if not done: signoff_match = RE_SIGNOFF.match(line) @@ -672,9 +673,13 @@ def insert_tags(msg, tags_to_emit): out += tags_to_emit emit_tags = False done = True + emit_blank = not (signoff_match or tag_match) + else: + emit_blank = line out.append(line) if not done: - out.append('') + if emit_blank: + out.append('') out += tags_to_emit return '\n'.join(out) |