Signed-off-by: Trevor Gamblin <[email protected]>
---
meta/lib/patchtest/tests/test_mbox_merge.py | 2 ++
1 file changed, 2 insertions(+)
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',
--
2.41.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#189482):
https://lists.openembedded.org/g/openembedded-core/message/189482
Mute This Topic: https://lists.openembedded.org/mt/102068908/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
