diff options
| author |   Trevor Gamblin <tgamblin@baylibre.com> | 2023-10-19 17:03:32 -0400 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2023-11-20 08:40:39 -1000 |
| commit | 127fa20bd1d628548f7f4ba087b3ca105e705098 (patch) | |
| tree | 9efb674112ecee371d3a6180ff0c4a5818a01ecd | |
| parent | 06d2066a5061d23a316f65cfc731ce44b576b2bf (diff) | |
| download | openembedded-core-127fa20bd1d628548f7f4ba087b3ca105e705098.tar.gz | |
patchtest: skip merge test if not targeting master
Avoid testing mergeability of a patch when not targeting master, so that
patches tested via other means (e.g. maintainer branches and AB runs)
don't get unnecessarily reviewed an extra time.
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e6cf23e353f48c57249681bd0b12bd8494d4959a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/lib/patchtest/tests/test_mbox_merge.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/lib/patchtest/tests/test_mbox_merge.py b/meta/lib/patchtest/tests/test_mbox_merge.py index bc55c588b4..f69d57c71b 100644 --- a/meta/lib/patchtest/tests/test_mbox_merge.py +++ b/meta/lib/patchtest/tests/test_mbox_merge.py @@ -18,6 +18,8 @@ def headlog(): class Merge(base.Base): def test_series_merge_on_head(self): + if PatchTestInput.repo.branch != "master": + self.skip("Skipping merge test since patch is not intended for master branch. Target detected is %s" % PatchTestInput.repo.branch) if not PatchTestInput.repo.ismerged: commithash, author, date, shortlog = headlog() self.fail('Series does not apply on top of target branch. Rebase your series and ensure the target is correct', |