diff mbox series

oeqa/selftest/bbtests: tweak test_git_unpack_nonetwork_fail to match either fetch or fetch2 in error message

Message ID 20260830134952.4182115-2-chris.laplante@agilent.com
State New
Headers show
Series oeqa/selftest/bbtests: tweak test_git_unpack_nonetwork_fail to match either fetch or fetch2 in error message | expand

Commit Message

chris.laplante@agilent.com Aug. 30, 2026, 1:49 p.m. UTC 
From: Chris Laplante <chris.laplante@agilent.com>

BitBake is renaming bb.fetch2 to bb.fetch, but the existing srcrev test
looks for bb.fetch2.get_srcrev() in the assertion. Change the regex to
match either fetch or fetch2.

This avoids https://autobuilder.yoctoproject.org/valkyrie/#/builders/23/builds/4744/steps/17/logs/errors

Signed-off-by: Chris Laplante <chris.laplante@agilent.com>
---
 meta/lib/oeqa/selftest/cases/bbtests.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

patchtest@automation.yoctoproject.org Aug. 30, 2026, 2:01 p.m. UTC | #1 
Thank you for your submission. Patchtest identified one
or more issues with the patch. Please see the log below for
more information:

---
Testing patch /home/patchtest/share/mboxes/oeqa-selftest-bbtests-tweak-test_git_unpack_nonetwork_fail-to-match-either-fetch-or-fetch2-in-error-message.patch

FAIL: test max line length: Patch line too long (current length 244, maximum is 200) (test_metadata.TestMetadata.test_max_line_length)
FAIL: test shortlog length: Edit shortlog so that it is 90 characters or less (currently 108 characters) (test_mbox.TestMbox.test_shortlog_length)

PASS: pretest pylint (test_python_pylint.PyLint.pretest_pylint)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test auh changelog truncation notice (test_mbox.TestMbox.test_auh_changelog_truncation_notice)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test pylint (test_python_pylint.PyLint.test_pylint)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.pretest_src_uri_left_files)
SKIP: test CVE check ignore: No modified recipes or older target branch, skipping test (test_metadata.TestMetadata.test_cve_check_ignore)
SKIP: test CVE tag format: No new source patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new source patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new source patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test src uri left files: No modified recipes, skipping test (test_metadata.TestMetadata.test_src_uri_left_files)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this
email with an explanation of why the patch should be accepted. If you
believe these results are due to an error in patchtest, please submit a
bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category
under 'Yocto Project Subprojects'). For more information on specific
failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank
you!
chris.laplante@agilent.com Aug. 30, 2026, 2:11 p.m. UTC | #2 
> Testing patch /home/patchtest/share/mboxes/oeqa-selftest-bbtests-tweak-
> test_git_unpack_nonetwork_fail-to-match-either-fetch-or-fetch2-in-error-
> message.patch
> 
> FAIL: test max line length: Patch line too long (current length 244, maximum is
> 200) (test_metadata.TestMetadata.test_max_line_length)
> FAIL: test shortlog length: Edit shortlog so that it is 90 characters or less
> (currently 108 characters) (test_mbox.TestMbox.test_shortlog_length)

OK, I understand the 'shortlog length' failure and will send a v2. 

But I'm struggling to imagine how "Patch line too long" is a useful thing to check, especially when the original line is already over the limit? Am I supposed to break it up or something? 

Thanks,
Chris
diff mbox series

Patch

diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py
index 860f499269..519d96d4b4 100644
--- a/meta/lib/oeqa/selftest/cases/bbtests.py
+++ b/meta/lib/oeqa/selftest/cases/bbtests.py
@@ -365,7 +365,9 @@  require conf/distro/include/no-gplv3.inc
         self.write_config("DISTROOVERRIDES .= \":gitunpack-enable-recipe\"")
 
         result = bitbake('gitunpackoffline-fail -c fetch', ignore_status=True)
-        self.assertTrue(re.search("Recipe uses a floating tag/branch .* for repo .* without a fixed SRCREV yet doesn't call bb.fetch2.get_srcrev()", result.output), msg = "Recipe without PV set to SRCPV should have failed: %s" % result.output)
+        # Match either 'bb.fetch2.get_srcrev()' or 'bb.fetch.get_srcrev()' in the
+        # error message, in preparation for bb.fetch2 => bb.fetch migration in BitBake.
+        self.assertTrue(re.search("Recipe uses a floating tag/branch .* for repo .* without a fixed SRCREV yet doesn't call bb.fetch2?.get_srcrev()", result.output), msg = "Recipe without PV set to SRCPV should have failed: %s" % result.output)
 
     def test_unexpanded_variable_in_path(self):
         """