diff options
| author | Trevor Gamblin <tgamblin@baylibre.com> | 2023-10-24 14:40:08 -0400 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2023-11-24 05:01:37 -1000 |
| commit | 48537fb77b51c9b7e0bdee5264d78cf9a0c4b6af (patch) | |
| tree | 465ad22e00cfd366608bf8472fde94bcacb41d63 /meta/lib/patchtest/tests | |
| parent | 174a6427558ed99aff53d71a58aaea56a349a0e1 (diff) | |
| download | poky-48537fb77b51c9b7e0bdee5264d78cf9a0c4b6af.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).
(From OE-Core rev: 97c1d8aa7318e36a037aa6c8b721fb75608a92a7)
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e561c614dc72b7f8bf5e09a09bbe6ebc3cf500bb)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/lib/patchtest/tests')
| -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: |