diff options
Diffstat (limited to 'meta/lib/patchtest/tests/test_mbox_merge.py')
-rw-r--r-- | meta/lib/patchtest/tests/test_mbox_merge.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/lib/patchtest/tests/test_mbox_merge.py b/meta/lib/patchtest/tests/test_mbox_merge.py index f69d57c71b..535026209f 100644 --- a/meta/lib/patchtest/tests/test_mbox_merge.py +++ b/meta/lib/patchtest/tests/test_mbox_merge.py | |||
@@ -18,6 +18,7 @@ def headlog(): | |||
18 | 18 | ||
19 | class Merge(base.Base): | 19 | class Merge(base.Base): |
20 | def test_series_merge_on_head(self): | 20 | def test_series_merge_on_head(self): |
21 | self.skip("Merge test is disabled for now") | ||
21 | if PatchTestInput.repo.branch != "master": | 22 | 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) | 23 | self.skip("Skipping merge test since patch is not intended for master branch. Target detected is %s" % PatchTestInput.repo.branch) |
23 | if not PatchTestInput.repo.ismerged: | 24 | if not PatchTestInput.repo.ismerged: |