summaryrefslogtreecommitdiffstats
path: root/meta/lib/patchtest/tests/test_mbox_merge.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/patchtest/tests/test_mbox_merge.py')
-rw-r--r--meta/lib/patchtest/tests/test_mbox_merge.py2
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():
18 18
19class Merge(base.Base): 19class Merge(base.Base):
20 def test_series_merge_on_head(self): 20 def test_series_merge_on_head(self):
21 if PatchTestInput.repo.branch != "master":
22 self.skip("Skipping merge test since patch is not intended for master branch. Target detected is %s" % PatchTestInput.repo.branch)
21 if not PatchTestInput.repo.ismerged: 23 if not PatchTestInput.repo.ismerged:
22 commithash, author, date, shortlog = headlog() 24 commithash, author, date, shortlog = headlog()
23 self.fail('Series does not apply on top of target branch. Rebase your series and ensure the target is correct', 25 self.fail('Series does not apply on top of target branch. Rebase your series and ensure the target is correct',