diff options
| author |   Trevor Gamblin <tgamblin@baylibre.com> | 2023-10-24 14:40:08 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-24 21:41:55 +0100 |
| commit | e561c614dc72b7f8bf5e09a09bbe6ebc3cf500bb (patch) | |
| tree | 5aedabfef60ca7645a4f1d4e0e15e3014f2d78d7 /meta/lib | |
| parent | 98ca0b151517b3544454fd5c1656a2de631c4897 (diff) | |
| download | openembedded-core-contrib-e561c614dc72b7f8bf5e09a09bbe6ebc3cf500bb.tar.gz | |
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).
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -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(): 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: |