mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
8cea0676b7
Avoid testing mergeability of a patch when not targeting master, so that patches tested via other means (e.g. maintainer branches and AB runs) don't get unnecessarily reviewed an extra time. (From OE-Core rev: e6cf23e353f48c57249681bd0b12bd8494d4959a) Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
27 lines
1020 B
Python
27 lines
1020 B
Python
# Check if mbox was merged by patchtest
|
|
#
|
|
# Copyright (C) 2016 Intel Corporation
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-only
|
|
|
|
import subprocess
|
|
import base
|
|
from data import PatchTestInput
|
|
|
|
def headlog():
|
|
output = subprocess.check_output(
|
|
"cd %s; git log --pretty='%%h#%%aN#%%cD:#%%s' -1" % PatchTestInput.repodir,
|
|
universal_newlines=True,
|
|
shell=True
|
|
)
|
|
return output.split('#')
|
|
|
|
class Merge(base.Base):
|
|
def test_series_merge_on_head(self):
|
|
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:
|
|
commithash, author, date, shortlog = headlog()
|
|
self.fail('Series does not apply on top of target branch. Rebase your series and ensure the target is correct',
|
|
data=[('Targeted branch', '%s (currently at %s)' % (PatchTestInput.repo.branch, commithash))])
|