mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-19 13:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

patchtest: fix repo.canbemerged usage

Browse Source 
Call it like a function to avoid it being interpreted as True always.

(From OE-Core rev: df73a692049675b7dc110779b7853f2e79a61737)

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Gyorgy Sarvari
2025-09-15 11:02:06 +02:00
committed by Richard Purdie
parent a690cfb9c0
commit 6254619b7f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/lib/patchtest/tests/test_mbox.py
View File

@@ -90,7 +90,7 @@ class TestMbox(base.Base):
" for master branch. Target detected is %s"
% PatchtestParser.repo.patch.branch
)
if not PatchtestParser.repo.canbemerged:
if not PatchtestParser.repo.canbemerged():
commithash, author, date, shortlog = headlog()
self.fail(
"Series does not apply on top of target branch %s"

4
meta/lib/patchtest/tests/test_metadata.py
View File

@@ -110,7 +110,7 @@ class TestMetadata(base.Metadata):
def pretest_src_uri_left_files(self):
# these tests just make sense on patches that can be merged
if not PatchtestParser.repo.canbemerged:
if not PatchtestParser.repo.canbemerged():
self.skip("Patch cannot be merged")
if not self.modified:
self.skip('No modified recipes, skipping pretest')
@@ -127,7 +127,7 @@ class TestMetadata(base.Metadata):
def test_src_uri_left_files(self):
# these tests just make sense on patches that can be merged
if not PatchtestParser.repo.canbemerged:
if not PatchtestParser.repo.canbemerged():
self.skip("Patch cannot be merged")
if not self.modified:
self.skip('No modified recipes, skipping pretest')