diff options
| author | Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> | 2025-09-19 08:50:59 +0200 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2025-09-23 08:42:53 -0700 |
| commit | 586fa710833319117c08bb2e3b53224dfde4d3cb (patch) | |
| tree | 1680e3e3b431899c7492e33ab9de6c05bde19c42 | |
| parent | 619c00830682737a830dc79c48131e3767fb4c7c (diff) | |
| download | poky-586fa710833319117c08bb2e3b53224dfde4d3cb.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: ac097300921590ed6a814f2c3fa08a59f4ded92d)
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | bitbake/lib/bb/tests/fetch.py | 22 |
1 files changed, 11 insertions, 11 deletions
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): | |||
| 3135 | @skipIfNoNetwork() | 3135 | @skipIfNoNetwork() |
| 3136 | def test_tag_rev_match(self): | 3136 | def test_tag_rev_match(self): |
| 3137 | # Test a url with rev= and tag= set works | 3137 | # Test a url with rev= and tag= set works |
| 3138 | fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.7"], self.d) | 3138 | fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.12.0"], self.d) |
| 3139 | fetcher.download() | 3139 | fetcher.download() |
| 3140 | fetcher.unpack(self.unpackdir) | 3140 | fetcher.unpack(self.unpackdir) |
| 3141 | 3141 | ||
| 3142 | @skipIfNoNetwork() | 3142 | @skipIfNoNetwork() |
| 3143 | def test_tag_rev_match2(self): | 3143 | def test_tag_rev_match2(self): |
| 3144 | # Test a url with SRCREV and tag= set works | 3144 | # Test a url with SRCREV and tag= set works |
| 3145 | self.d.setVar('SRCREV', 'aa0e540fc31a1c26839efd2c7785a751ce24ebfb') | 3145 | self.d.setVar('SRCREV', '5b4e20377eea8d428edf1aeb2187c18f82ca6757') |
| 3146 | fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;tag=2.8.7"], self.d) | 3146 | fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;tag=2.12.0"], self.d) |
| 3147 | fetcher.download() | 3147 | fetcher.download() |
| 3148 | fetcher.unpack(self.unpackdir) | 3148 | fetcher.unpack(self.unpackdir) |
| 3149 | 3149 | ||
| 3150 | @skipIfNoNetwork() | 3150 | @skipIfNoNetwork() |
| 3151 | def test_tag_rev_match3(self): | 3151 | def test_tag_rev_match3(self): |
| 3152 | # Test a url with SRCREV, rev= and tag= set works | 3152 | # Test a url with SRCREV, rev= and tag= set works |
| 3153 | self.d.setVar('SRCREV', 'aa0e540fc31a1c26839efd2c7785a751ce24ebfb') | 3153 | self.d.setVar('SRCREV', '5b4e20377eea8d428edf1aeb2187c18f82ca6757') |
| 3154 | fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.7"], self.d) | 3154 | fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.12.0"], self.d) |
| 3155 | fetcher.download() | 3155 | fetcher.download() |
| 3156 | fetcher.unpack(self.unpackdir) | 3156 | fetcher.unpack(self.unpackdir) |
| 3157 | 3157 | ||
| @@ -3160,14 +3160,14 @@ class GitTagVerificationTests(FetcherTest): | |||
| 3160 | # Test a url with SRCREV and rev= mismatching errors | 3160 | # Test a url with SRCREV and rev= mismatching errors |
| 3161 | self.d.setVar('SRCREV', 'bade540fc31a1c26839efd2c7785a751ce24ebfb') | 3161 | self.d.setVar('SRCREV', 'bade540fc31a1c26839efd2c7785a751ce24ebfb') |
| 3162 | with self.assertRaises(bb.fetch2.FetchError): | 3162 | with self.assertRaises(bb.fetch2.FetchError): |
| 3163 | fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.7"], self.d) | 3163 | fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.12.0"], self.d) |
| 3164 | 3164 | ||
| 3165 | @skipIfNoNetwork() | 3165 | @skipIfNoNetwork() |
| 3166 | def test_tag_rev_match5(self): | 3166 | def test_tag_rev_match5(self): |
| 3167 | # Test a url with SRCREV, rev= and tag= set works when using shallow clones | 3167 | # Test a url with SRCREV, rev= and tag= set works when using shallow clones |
| 3168 | self.d.setVar('BB_GIT_SHALLOW', '1') | 3168 | self.d.setVar('BB_GIT_SHALLOW', '1') |
| 3169 | self.d.setVar('SRCREV', 'aa0e540fc31a1c26839efd2c7785a751ce24ebfb') | 3169 | self.d.setVar('SRCREV', '5b4e20377eea8d428edf1aeb2187c18f82ca6757') |
| 3170 | fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.7"], self.d) | 3170 | fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.12.0"], self.d) |
| 3171 | fetcher.download() | 3171 | fetcher.download() |
| 3172 | fetcher.unpack(self.unpackdir) | 3172 | fetcher.unpack(self.unpackdir) |
| 3173 | 3173 | ||
| @@ -3175,7 +3175,7 @@ class GitTagVerificationTests(FetcherTest): | |||
| 3175 | def test_tag_rev_match6(self): | 3175 | def test_tag_rev_match6(self): |
| 3176 | # Test a url with SRCREV, rev= and a mismatched tag= when using shallow clones | 3176 | # Test a url with SRCREV, rev= and a mismatched tag= when using shallow clones |
| 3177 | self.d.setVar('BB_GIT_SHALLOW', '1') | 3177 | self.d.setVar('BB_GIT_SHALLOW', '1') |
| 3178 | fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.6"], self.d) | 3178 | fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.8.0"], self.d) |
| 3179 | fetcher.download() | 3179 | fetcher.download() |
| 3180 | with self.assertRaises(bb.fetch2.FetchError): | 3180 | with self.assertRaises(bb.fetch2.FetchError): |
| 3181 | fetcher.unpack(self.unpackdir) | 3181 | fetcher.unpack(self.unpackdir) |
| @@ -3183,8 +3183,8 @@ class GitTagVerificationTests(FetcherTest): | |||
| 3183 | @skipIfNoNetwork() | 3183 | @skipIfNoNetwork() |
| 3184 | def test_tag_rev_match7(self): | 3184 | def test_tag_rev_match7(self): |
| 3185 | # Test a url with SRCREV, rev= and a mismatched tag= | 3185 | # Test a url with SRCREV, rev= and a mismatched tag= |
| 3186 | self.d.setVar('SRCREV', 'aa0e540fc31a1c26839efd2c7785a751ce24ebfb') | 3186 | self.d.setVar('SRCREV', '5b4e20377eea8d428edf1aeb2187c18f82ca6757') |
| 3187 | fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.8;protocol=https;rev=aa0e540fc31a1c26839efd2c7785a751ce24ebfb;tag=2.8.6"], self.d) | 3187 | fetcher = bb.fetch.Fetch(["git://git.openembedded.org/bitbake;branch=2.12;protocol=https;rev=5b4e20377eea8d428edf1aeb2187c18f82ca6757;tag=2.8.0"], self.d) |
| 3188 | fetcher.download() | 3188 | fetcher.download() |
| 3189 | with self.assertRaises(bb.fetch2.FetchError): | 3189 | with self.assertRaises(bb.fetch2.FetchError): |
| 3190 | fetcher.unpack(self.unpackdir) | 3190 | fetcher.unpack(self.unpackdir) |
