From 48537fb77b51c9b7e0bdee5264d78cf9a0c4b6af Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Tue, 24 Oct 2023 14:40:08 -0400 Subject: patchtest: disable merge test Disable the merge-on-head test until patchtest properly handles merging of series subsets and accounts for patches that are rapidly merged (i.e. before patchtest is run). (From OE-Core rev: 97c1d8aa7318e36a037aa6c8b721fb75608a92a7) Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie (cherry picked from commit e561c614dc72b7f8bf5e09a09bbe6ebc3cf500bb) Signed-off-by: Steve Sakoman --- meta/lib/patchtest/tests/test_mbox_merge.py | 1 + 1 file changed, 1 insertion(+) (limited to 'meta/lib/patchtest/tests/test_mbox_merge.py') 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(): class Merge(base.Base): def test_series_merge_on_head(self): + self.skip("Merge test is disabled for now") 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: -- cgit v1.2.3-54-g00ecf