From df73a692049675b7dc110779b7853f2e79a61737 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Mon, 15 Sep 2025 11:02:06 +0200 Subject: [PATCH] patchtest: fix repo.canbemerged usage Call it like a function to avoid it being interpreted as True always. Signed-off-by: Gyorgy Sarvari Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/lib/patchtest/tests/test_mbox.py | 2 +- meta/lib/patchtest/tests/test_metadata.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/patchtest/tests/test_mbox.py b/meta/lib/patchtest/tests/test_mbox.py index dab733ea77..714c9b30af 100644 --- a/meta/lib/patchtest/tests/test_mbox.py +++ b/meta/lib/patchtest/tests/test_mbox.py @@ -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" diff --git a/meta/lib/patchtest/tests/test_metadata.py b/meta/lib/patchtest/tests/test_metadata.py index 2dee80b002..63d01819e7 100644 --- a/meta/lib/patchtest/tests/test_metadata.py +++ b/meta/lib/patchtest/tests/test_metadata.py @@ -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') -- 2.47.3