diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index d216eac2ab..e027705bf4 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py @@ -3334,30 +3334,30 @@ 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) def test_annotated_tag_rev_match(self): # Test a url with rev= and tag= set works # rev is the annotated tag revision in this case - fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=6d363159e4b7dc566fc40d069b2615e61774a7d8;tag=2.8.7"], self.d) + fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=fa30183549bd09f33fd4eebf56771ca5393526a6;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) @@ -3366,14 +3366,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) @@ -3381,7 +3381,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) @@ -3389,8 +3389,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)