summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>2025-09-19 08:50:59 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-09-23 09:37:35 +0100
commite90bc48bdaa2234cad52bbb2800f5246c277ffbd (patch)
tree1b4d9e68c0a6e95a02e152eb9959c9c28fb78bd6
parent02493e994e205a416f9c6711e5b25de0fc71d6cc (diff)
downloadpoky-e90bc48bdaa2234cad52bbb2800f5246c277ffbd.tar.gz
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: dcf12947954f3184d99fbf9813b3f3f667dacc5f) Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/tests/fetch.py24
1 files changed, 12 insertions, 12 deletions
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):
3334 @skipIfNoNetwork() 3334 @skipIfNoNetwork()
3335 def test_tag_rev_match(self): 3335 def test_tag_rev_match(self):
3336 # Test a url with rev= and tag= set works 3336 # Test a url with rev= and tag= set works
3337 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.7"], self.d) 3337 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.12.0"], self.d)
3338 fetcher.download() 3338 fetcher.download()
3339 fetcher.unpack(self.unpackdir) 3339 fetcher.unpack(self.unpackdir)
3340 3340
3341 def test_annotated_tag_rev_match(self): 3341 def test_annotated_tag_rev_match(self):
3342 # Test a url with rev= and tag= set works 3342 # Test a url with rev= and tag= set works
3343 # rev is the annotated tag revision in this case 3343 # rev is the annotated tag revision in this case
3344 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=6d363159e4b7dc566fc40d069b2615e61774a7d8;tag=2.8.7"], self.d) 3344 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=fa30183549bd09f33fd4eebf56771ca5393526a6;tag=2.12.0"], self.d)
3345 fetcher.download() 3345 fetcher.download()
3346 fetcher.unpack(self.unpackdir) 3346 fetcher.unpack(self.unpackdir)
3347 3347
3348 @skipIfNoNetwork() 3348 @skipIfNoNetwork()
3349 def test_tag_rev_match2(self): 3349 def test_tag_rev_match2(self):
3350 # Test a url with SRCREV and tag= set works 3350 # Test a url with SRCREV and tag= set works
3351 self.d.setVar('SRCREV', 'aa0e540fc31a1c26839efd2c7785a751ce24ebfb') 3351 self.d.setVar('SRCREV', '5b4e20377eea8d428edf1aeb2187c18f82ca6757')
3352 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;tag=2.8.7"], self.d) 3352 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;tag=2.12.0"], self.d)
3353 fetcher.download() 3353 fetcher.download()
3354 fetcher.unpack(self.unpackdir) 3354 fetcher.unpack(self.unpackdir)
3355 3355
3356 @skipIfNoNetwork() 3356 @skipIfNoNetwork()
3357 def test_tag_rev_match3(self): 3357 def test_tag_rev_match3(self):
3358 # Test a url with SRCREV, rev= and tag= set works 3358 # Test a url with SRCREV, rev= and tag= set works
3359 self.d.setVar('SRCREV', 'aa0e540fc31a1c26839efd2c7785a751ce24ebfb') 3359 self.d.setVar('SRCREV', '5b4e20377eea8d428edf1aeb2187c18f82ca6757')
3360 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.7"], self.d) 3360 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.12.0"], self.d)
3361 fetcher.download() 3361 fetcher.download()
3362 fetcher.unpack(self.unpackdir) 3362 fetcher.unpack(self.unpackdir)
3363 3363
@@ -3366,14 +3366,14 @@ class GitTagVerificationTests(FetcherTest):
3366 # Test a url with SRCREV and rev= mismatching errors 3366 # Test a url with SRCREV and rev= mismatching errors
3367 self.d.setVar('SRCREV', 'bade540fc31a1c26839efd2c7785a751ce24ebfb') 3367 self.d.setVar('SRCREV', 'bade540fc31a1c26839efd2c7785a751ce24ebfb')
3368 with self.assertRaises(bb.fetch2.FetchError): 3368 with self.assertRaises(bb.fetch2.FetchError):
3369 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.7"], self.d) 3369 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.12.0"], self.d)
3370 3370
3371 @skipIfNoNetwork() 3371 @skipIfNoNetwork()
3372 def test_tag_rev_match5(self): 3372 def test_tag_rev_match5(self):
3373 # Test a url with SRCREV, rev= and tag= set works when using shallow clones 3373 # Test a url with SRCREV, rev= and tag= set works when using shallow clones
3374 self.d.setVar('BB_GIT_SHALLOW', '1') 3374 self.d.setVar('BB_GIT_SHALLOW', '1')
3375 self.d.setVar('SRCREV', 'aa0e540fc31a1c26839efd2c7785a751ce24ebfb') 3375 self.d.setVar('SRCREV', '5b4e20377eea8d428edf1aeb2187c18f82ca6757')
3376 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.7"], self.d) 3376 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.12.0"], self.d)
3377 fetcher.download() 3377 fetcher.download()
3378 fetcher.unpack(self.unpackdir) 3378 fetcher.unpack(self.unpackdir)
3379 3379
@@ -3381,7 +3381,7 @@ class GitTagVerificationTests(FetcherTest):
3381 def test_tag_rev_match6(self): 3381 def test_tag_rev_match6(self):
3382 # Test a url with SRCREV, rev= and a mismatched tag= when using shallow clones 3382 # Test a url with SRCREV, rev= and a mismatched tag= when using shallow clones
3383 self.d.setVar('BB_GIT_SHALLOW', '1') 3383 self.d.setVar('BB_GIT_SHALLOW', '1')
3384 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.6"], self.d) 3384 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.8.0"], self.d)
3385 fetcher.download() 3385 fetcher.download()
3386 with self.assertRaises(bb.fetch2.FetchError): 3386 with self.assertRaises(bb.fetch2.FetchError):
3387 fetcher.unpack(self.unpackdir) 3387 fetcher.unpack(self.unpackdir)
@@ -3389,8 +3389,8 @@ class GitTagVerificationTests(FetcherTest):
3389 @skipIfNoNetwork() 3389 @skipIfNoNetwork()
3390 def test_tag_rev_match7(self): 3390 def test_tag_rev_match7(self):
3391 # Test a url with SRCREV, rev= and a mismatched tag= 3391 # Test a url with SRCREV, rev= and a mismatched tag=
3392 self.d.setVar('SRCREV', 'aa0e540fc31a1c26839efd2c7785a751ce24ebfb') 3392 self.d.setVar('SRCREV', '5b4e20377eea8d428edf1aeb2187c18f82ca6757')
3393 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.6"], self.d) 3393 fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.8.0"], self.d)
3394 fetcher.download() 3394 fetcher.download()
3395 with self.assertRaises(bb.fetch2.FetchError): 3395 with self.assertRaises(bb.fetch2.FetchError):
3396 fetcher.unpack(self.unpackdir) 3396 fetcher.unpack(self.unpackdir)