diff mbox series

[1/2] patchtest: skip merge test if not targeting master

Message ID 20231019204927.2290521-1-tgamblin@baylibre.com
State Accepted, archived
Commit e6cf23e353f48c57249681bd0b12bd8494d4959a
Headers show
Series [1/2] patchtest: skip merge test if not targeting master | expand

Commit Message

Trevor Gamblin Oct. 19, 2023, 8:49 p.m. UTC 
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
 meta/lib/patchtest/tests/test_mbox_merge.py | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series

Patch

diff --git a/meta/lib/patchtest/tests/test_mbox_merge.py b/meta/lib/patchtest/tests/test_mbox_merge.py
index bc55c588b40..013b9e0144d 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")
         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',