diff options
author | Gyorgy Sarvari <skandigraun@gmail.com> | 2025-09-15 11:02:06 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-09-18 11:16:35 +0100 |
commit | 6254619b7f12e44ed27f2c98a3b08af886f60e10 (patch) | |
tree | 6b4d47cf2d9e4734581517cd06a13096f0971f66 | |
parent | a690cfb9c05f4fbd23712e6eada376d023a6036a (diff) | |
download | poky-6254619b7f12e44ed27f2c98a3b08af886f60e10.tar.gz |
patchtest: fix repo.canbemerged usage
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>
-rw-r--r-- | meta/lib/patchtest/tests/test_mbox.py | 2 | ||||
-rw-r--r-- | 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): | |||
90 | " for master branch. Target detected is %s" | 90 | " for master branch. Target detected is %s" |
91 | % PatchtestParser.repo.patch.branch | 91 | % PatchtestParser.repo.patch.branch |
92 | ) | 92 | ) |
93 | if not PatchtestParser.repo.canbemerged: | 93 | if not PatchtestParser.repo.canbemerged(): |
94 | commithash, author, date, shortlog = headlog() | 94 | commithash, author, date, shortlog = headlog() |
95 | self.fail( | 95 | self.fail( |
96 | "Series does not apply on top of target branch %s" | 96 | "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): | |||
110 | 110 | ||
111 | def pretest_src_uri_left_files(self): | 111 | def pretest_src_uri_left_files(self): |
112 | # these tests just make sense on patches that can be merged | 112 | # these tests just make sense on patches that can be merged |
113 | if not PatchtestParser.repo.canbemerged: | 113 | if not PatchtestParser.repo.canbemerged(): |
114 | self.skip("Patch cannot be merged") | 114 | self.skip("Patch cannot be merged") |
115 | if not self.modified: | 115 | if not self.modified: |
116 | self.skip('No modified recipes, skipping pretest') | 116 | self.skip('No modified recipes, skipping pretest') |
@@ -127,7 +127,7 @@ class TestMetadata(base.Metadata): | |||
127 | 127 | ||
128 | def test_src_uri_left_files(self): | 128 | def test_src_uri_left_files(self): |
129 | # these tests just make sense on patches that can be merged | 129 | # these tests just make sense on patches that can be merged |
130 | if not PatchtestParser.repo.canbemerged: | 130 | if not PatchtestParser.repo.canbemerged(): |
131 | self.skip("Patch cannot be merged") | 131 | self.skip("Patch cannot be merged") |
132 | if not self.modified: | 132 | if not self.modified: |
133 | self.skip('No modified recipes, skipping pretest') | 133 | self.skip('No modified recipes, skipping pretest') |