From: Chris Laplante <[email protected]> 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 <[email protected]> --- meta/lib/oeqa/selftest/cases/bbtests.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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): """ -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#244654): https://lists.openembedded.org/g/openembedded-core/message/244654 Mute This Topic: https://lists.openembedded.org/mt/120998770/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
