| Message ID | 20231024184008.68387-1-tgamblin@baylibre.com |
|---|---|
| State | Accepted, archived |
| Commit | e561c614dc72b7f8bf5e09a09bbe6ebc3cf500bb |
| Headers | show |
| Series | patchtest: disable merge test | expand |
diff --git a/meta/lib/patchtest/tests/test_mbox_merge.py b/meta/lib/patchtest/tests/test_mbox_merge.py index f69d57c71b1..535026209f7 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:
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). Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> --- meta/lib/patchtest/tests/test_mbox_merge.py | 1 + 1 file changed, 1 insertion(+)