From 6a7dd95bd8dfa59495f0213b4fee0b81a60518d5 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Feb 01 2022 18:18:44 +0000 Subject: test_series_sort.py: Also test submitted patch. --- diff --git a/scripts/git_sort/tests/support.py b/scripts/git_sort/tests/support.py index 7a2fb59..bd1460d 100644 --- a/scripts/git_sort/tests/support.py +++ b/scripts/git_sort/tests/support.py @@ -3,6 +3,7 @@ import datetime import os.path +import re import pygit2_wrapper as pygit2 @@ -69,7 +70,8 @@ def format_patch(commit, mainline=None, repo=None, references=None, f.write("Date: %s\n" % (dt.strftime("%c %z"),)) if mainline and repo is None: f.write("Patch-mainline: %s\n" % (mainline,)) - f.write("Git-commit: %s\n" % (str(commit.id),)) + if re.match("^v", mainline): + f.write("Git-commit: %s\n" % (str(commit.id),)) elif mainline is None and repo: f.write("Patch-mainline: Queued in subsystem maintainer repository\n") f.write("Git-repo: %s\n" % (repo,)) diff --git a/scripts/git_sort/tests/test_series_sort.py b/scripts/git_sort/tests/test_series_sort.py index 67e2e4a..fa2f720 100755 --- a/scripts/git_sort/tests/test_series_sort.py +++ b/scripts/git_sort/tests/test_series_sort.py @@ -124,7 +124,7 @@ class TestSeriesSort(unittest.TestCase): tests.support.format_patch(self.repo.get(n1), repo=net_repo) tests.support.format_patch(self.repo.get(n2), repo=net_repo) tests.support.format_patch(self.repo.get(oot0)) - tests.support.format_patch(self.repo.get(oot1)) + tests.support.format_patch(self.repo.get(oot1), mainline="Submitted http://lore.kernel.org/somelist/somemessage") os.chdir(self.ks_dir)