From 586fa710833319117c08bb2e3b53224dfde4d3cb Mon Sep 17 00:00:00 2001 From: Mathieu Dubois-Briand Date: Fri, 19 Sep 2025 08:50:59 +0200 Subject: bitbake: tests/fetch: Update tests after bitbake tag removal Tags for bitbake 2.8.6 and 2.8.7 have been removed from the git: use some other ones. (Bitbake rev: ac097300921590ed6a814f2c3fa08a59f4ded92d) Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- bitbake/lib/bb/tests/fetch.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'bitbake/lib/bb/tests/fetch.py') diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index 6aa9453709..9270600dcd 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py @@ -3135,23 +3135,23 @@ class GitTagVerificationTests(FetcherTest): @skipIfNoNetwork() def test_tag_rev_match(self): # Test a url with rev= and tag= set works - fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.7"], self.d) + fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.12.0"], self.d) fetcher.download() fetcher.unpack(self.unpackdir) @skipIfNoNetwork() def test_tag_rev_match2(self): # Test a url with SRCREV and tag= set works - self.d.setVar('SRCREV', 'aa0e540fc31a1c26839efd2c7785a751ce24ebfb') - fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;tag=2.8.7"], self.d) + self.d.setVar('SRCREV', '5b4e20377eea8d428edf1aeb2187c18f82ca6757') + fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;tag=2.12.0"], self.d) fetcher.download() fetcher.unpack(self.unpackdir) @skipIfNoNetwork() def test_tag_rev_match3(self): # Test a url with SRCREV, rev= and tag= set works - self.d.setVar('SRCREV', 'aa0e540fc31a1c26839efd2c7785a751ce24ebfb') - fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.7"], self.d) + self.d.setVar('SRCREV', '5b4e20377eea8d428edf1aeb2187c18f82ca6757') + fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.12.0"], self.d) fetcher.download() fetcher.unpack(self.unpackdir) @@ -3160,14 +3160,14 @@ class GitTagVerificationTests(FetcherTest): # Test a url with SRCREV and rev= mismatching errors self.d.setVar('SRCREV', 'bade540fc31a1c26839efd2c7785a751ce24ebfb') with self.assertRaises(bb.fetch2.FetchError): - fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.7"], self.d) + fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.12.0"], self.d) @skipIfNoNetwork() def test_tag_rev_match5(self): # Test a url with SRCREV, rev= and tag= set works when using shallow clones self.d.setVar('BB_GIT_SHALLOW', '1') - self.d.setVar('SRCREV', 'aa0e540fc31a1c26839efd2c7785a751ce24ebfb') - fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.7"], self.d) + self.d.setVar('SRCREV', '5b4e20377eea8d428edf1aeb2187c18f82ca6757') + fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.12.0"], self.d) fetcher.download() fetcher.unpack(self.unpackdir) @@ -3175,7 +3175,7 @@ class GitTagVerificationTests(FetcherTest): def test_tag_rev_match6(self): # Test a url with SRCREV, rev= and a mismatched tag= when using shallow clones self.d.setVar('BB_GIT_SHALLOW', '1') - fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.6"], self.d) + fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.8.0"], self.d) fetcher.download() with self.assertRaises(bb.fetch2.FetchError): fetcher.unpack(self.unpackdir) @@ -3183,8 +3183,8 @@ class GitTagVerificationTests(FetcherTest): @skipIfNoNetwork() def test_tag_rev_match7(self): # Test a url with SRCREV, rev= and a mismatched tag= - self.d.setVar('SRCREV', 'aa0e540fc31a1c26839efd2c7785a751ce24ebfb') - fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.6"], self.d) + self.d.setVar('SRCREV', '5b4e20377eea8d428edf1aeb2187c18f82ca6757') + fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.8.0"], self.d) fetcher.download() with self.assertRaises(bb.fetch2.FetchError): fetcher.unpack(self.unpackdir) -- cgit v1.2.3-54-g00ecf