diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-11 15:51:16 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-12 17:05:58 +0000 |
commit | 82e6816024795bff3c447ae51d04bb2c9df8c4ab (patch) | |
tree | 16d635d47ed2c2abbb0b4c2f1d16d8f4ad95ab17 /bitbake/lib/bb/tests/fetch.py | |
parent | 305c1d179e1f2b660a578f939a15d7cd48148ab0 (diff) | |
download | poky-82e6816024795bff3c447ae51d04bb2c9df8c4ab.tar.gz |
bitbake: tests/fetch: Add missing branch param for git urls
We started to require the branch parameter for git urls. This updates
the tests to match and quieten some noise.
(Bitbake rev: e5144887f2b6ae266f7b52151005619480e80ec6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/tests/fetch.py')
-rw-r--r-- | bitbake/lib/bb/tests/fetch.py | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index 3fd8fac229..f368cd02b0 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py | |||
@@ -514,9 +514,9 @@ class MirrorUriTest(FetcherTest): | |||
514 | class GitDownloadDirectoryNamingTest(FetcherTest): | 514 | class GitDownloadDirectoryNamingTest(FetcherTest): |
515 | def setUp(self): | 515 | def setUp(self): |
516 | super(GitDownloadDirectoryNamingTest, self).setUp() | 516 | super(GitDownloadDirectoryNamingTest, self).setUp() |
517 | self.recipe_url = "git://git.openembedded.org/bitbake" | 517 | self.recipe_url = "git://git.openembedded.org/bitbake;branch=master" |
518 | self.recipe_dir = "git.openembedded.org.bitbake" | 518 | self.recipe_dir = "git.openembedded.org.bitbake" |
519 | self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https" | 519 | self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master" |
520 | self.mirror_dir = "github.com.openembedded.bitbake.git" | 520 | self.mirror_dir = "github.com.openembedded.bitbake.git" |
521 | 521 | ||
522 | self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40') | 522 | self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40') |
@@ -562,9 +562,9 @@ class GitDownloadDirectoryNamingTest(FetcherTest): | |||
562 | class TarballNamingTest(FetcherTest): | 562 | class TarballNamingTest(FetcherTest): |
563 | def setUp(self): | 563 | def setUp(self): |
564 | super(TarballNamingTest, self).setUp() | 564 | super(TarballNamingTest, self).setUp() |
565 | self.recipe_url = "git://git.openembedded.org/bitbake" | 565 | self.recipe_url = "git://git.openembedded.org/bitbake;branch=master" |
566 | self.recipe_tarball = "git2_git.openembedded.org.bitbake.tar.gz" | 566 | self.recipe_tarball = "git2_git.openembedded.org.bitbake.tar.gz" |
567 | self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https" | 567 | self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master" |
568 | self.mirror_tarball = "git2_github.com.openembedded.bitbake.git.tar.gz" | 568 | self.mirror_tarball = "git2_github.com.openembedded.bitbake.git.tar.gz" |
569 | 569 | ||
570 | self.d.setVar('BB_GENERATE_MIRROR_TARBALLS', '1') | 570 | self.d.setVar('BB_GENERATE_MIRROR_TARBALLS', '1') |
@@ -596,9 +596,9 @@ class TarballNamingTest(FetcherTest): | |||
596 | class GitShallowTarballNamingTest(FetcherTest): | 596 | class GitShallowTarballNamingTest(FetcherTest): |
597 | def setUp(self): | 597 | def setUp(self): |
598 | super(GitShallowTarballNamingTest, self).setUp() | 598 | super(GitShallowTarballNamingTest, self).setUp() |
599 | self.recipe_url = "git://git.openembedded.org/bitbake" | 599 | self.recipe_url = "git://git.openembedded.org/bitbake;branch=master" |
600 | self.recipe_tarball = "gitshallow_git.openembedded.org.bitbake_82ea737-1_master.tar.gz" | 600 | self.recipe_tarball = "gitshallow_git.openembedded.org.bitbake_82ea737-1_master.tar.gz" |
601 | self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https" | 601 | self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master" |
602 | self.mirror_tarball = "gitshallow_github.com.openembedded.bitbake.git_82ea737-1_master.tar.gz" | 602 | self.mirror_tarball = "gitshallow_github.com.openembedded.bitbake.git_82ea737-1_master.tar.gz" |
603 | 603 | ||
604 | self.d.setVar('BB_GIT_SHALLOW', '1') | 604 | self.d.setVar('BB_GIT_SHALLOW', '1') |
@@ -728,7 +728,7 @@ class FetcherLocalTest(FetcherTest): | |||
728 | 728 | ||
729 | # Fetch and check revision | 729 | # Fetch and check revision |
730 | self.d.setVar("SRCREV", "AUTOINC") | 730 | self.d.setVar("SRCREV", "AUTOINC") |
731 | url = "git://" + self.gitdir + ";protocol=file;" + suffix | 731 | url = "git://" + self.gitdir + ";branch=master;protocol=file;" + suffix |
732 | fetcher = bb.fetch.Fetch([url], self.d) | 732 | fetcher = bb.fetch.Fetch([url], self.d) |
733 | fetcher.download() | 733 | fetcher.download() |
734 | fetcher.unpack(self.unpackdir) | 734 | fetcher.unpack(self.unpackdir) |
@@ -952,19 +952,19 @@ class FetcherNetworkTest(FetcherTest): | |||
952 | 952 | ||
953 | @skipIfNoNetwork() | 953 | @skipIfNoNetwork() |
954 | def test_gitfetch(self): | 954 | def test_gitfetch(self): |
955 | url1 = url2 = "git://git.openembedded.org/bitbake" | 955 | url1 = url2 = "git://git.openembedded.org/bitbake;branch=master" |
956 | self.gitfetcher(url1, url2) | 956 | self.gitfetcher(url1, url2) |
957 | 957 | ||
958 | @skipIfNoNetwork() | 958 | @skipIfNoNetwork() |
959 | def test_gitfetch_goodsrcrev(self): | 959 | def test_gitfetch_goodsrcrev(self): |
960 | # SRCREV is set but matches rev= parameter | 960 | # SRCREV is set but matches rev= parameter |
961 | url1 = url2 = "git://git.openembedded.org/bitbake;rev=270a05b0b4ba0959fe0624d2a4885d7b70426da5" | 961 | url1 = url2 = "git://git.openembedded.org/bitbake;rev=270a05b0b4ba0959fe0624d2a4885d7b70426da5;branch=master" |
962 | self.gitfetcher(url1, url2) | 962 | self.gitfetcher(url1, url2) |
963 | 963 | ||
964 | @skipIfNoNetwork() | 964 | @skipIfNoNetwork() |
965 | def test_gitfetch_badsrcrev(self): | 965 | def test_gitfetch_badsrcrev(self): |
966 | # SRCREV is set but does not match rev= parameter | 966 | # SRCREV is set but does not match rev= parameter |
967 | url1 = url2 = "git://git.openembedded.org/bitbake;rev=dead05b0b4ba0959fe0624d2a4885d7b70426da5" | 967 | url1 = url2 = "git://git.openembedded.org/bitbake;rev=dead05b0b4ba0959fe0624d2a4885d7b70426da5;branch=master" |
968 | self.assertRaises(bb.fetch.FetchError, self.gitfetcher, url1, url2) | 968 | self.assertRaises(bb.fetch.FetchError, self.gitfetcher, url1, url2) |
969 | 969 | ||
970 | @skipIfNoNetwork() | 970 | @skipIfNoNetwork() |
@@ -979,7 +979,7 @@ class FetcherNetworkTest(FetcherTest): | |||
979 | # `usehead=1' and instead fetch the specified SRCREV. See | 979 | # `usehead=1' and instead fetch the specified SRCREV. See |
980 | # test_local_gitfetch_usehead() for a positive use of the usehead | 980 | # test_local_gitfetch_usehead() for a positive use of the usehead |
981 | # feature. | 981 | # feature. |
982 | url = "git://git.openembedded.org/bitbake;usehead=1" | 982 | url = "git://git.openembedded.org/bitbake;usehead=1;branch=master" |
983 | self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url) | 983 | self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url) |
984 | 984 | ||
985 | @skipIfNoNetwork() | 985 | @skipIfNoNetwork() |
@@ -988,19 +988,19 @@ class FetcherNetworkTest(FetcherTest): | |||
988 | # `usehead=1' and instead fetch the specified SRCREV. See | 988 | # `usehead=1' and instead fetch the specified SRCREV. See |
989 | # test_local_gitfetch_usehead() for a positive use of the usehead | 989 | # test_local_gitfetch_usehead() for a positive use of the usehead |
990 | # feature. | 990 | # feature. |
991 | url = "git://git.openembedded.org/bitbake;usehead=1;name=newName" | 991 | url = "git://git.openembedded.org/bitbake;usehead=1;name=newName;branch=master" |
992 | self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url) | 992 | self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url) |
993 | 993 | ||
994 | @skipIfNoNetwork() | 994 | @skipIfNoNetwork() |
995 | def test_gitfetch_finds_local_tarball_for_mirrored_url_when_previous_downloaded_by_the_recipe_url(self): | 995 | def test_gitfetch_finds_local_tarball_for_mirrored_url_when_previous_downloaded_by_the_recipe_url(self): |
996 | recipeurl = "git://git.openembedded.org/bitbake" | 996 | recipeurl = "git://git.openembedded.org/bitbake;branch=master" |
997 | mirrorurl = "git://someserver.org/bitbake" | 997 | mirrorurl = "git://someserver.org/bitbake;branch=master" |
998 | self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake") | 998 | self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake") |
999 | self.gitfetcher(recipeurl, mirrorurl) | 999 | self.gitfetcher(recipeurl, mirrorurl) |
1000 | 1000 | ||
1001 | @skipIfNoNetwork() | 1001 | @skipIfNoNetwork() |
1002 | def test_gitfetch_finds_local_tarball_when_previous_downloaded_from_a_premirror(self): | 1002 | def test_gitfetch_finds_local_tarball_when_previous_downloaded_from_a_premirror(self): |
1003 | recipeurl = "git://someserver.org/bitbake" | 1003 | recipeurl = "git://someserver.org/bitbake;branch=master" |
1004 | self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake") | 1004 | self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake") |
1005 | self.gitfetcher(recipeurl, recipeurl) | 1005 | self.gitfetcher(recipeurl, recipeurl) |
1006 | 1006 | ||
@@ -1017,9 +1017,9 @@ class FetcherNetworkTest(FetcherTest): | |||
1017 | @skipIfNoNetwork() | 1017 | @skipIfNoNetwork() |
1018 | def test_git_submodule(self): | 1018 | def test_git_submodule(self): |
1019 | # URL with ssh submodules | 1019 | # URL with ssh submodules |
1020 | url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=ssh-gitsm-tests;rev=049da4a6cb198d7c0302e9e8b243a1443cb809a7" | 1020 | url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=ssh-gitsm-tests;rev=049da4a6cb198d7c0302e9e8b243a1443cb809a7;branch=master" |
1021 | # Original URL (comment this if you have ssh access to git.yoctoproject.org) | 1021 | # Original URL (comment this if you have ssh access to git.yoctoproject.org) |
1022 | url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=master;rev=a2885dd7d25380d23627e7544b7bbb55014b16ee" | 1022 | url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=master;rev=a2885dd7d25380d23627e7544b7bbb55014b16ee;branch=master" |
1023 | fetcher = bb.fetch.Fetch([url], self.d) | 1023 | fetcher = bb.fetch.Fetch([url], self.d) |
1024 | fetcher.download() | 1024 | fetcher.download() |
1025 | # Previous cwd has been deleted | 1025 | # Previous cwd has been deleted |
@@ -1109,7 +1109,7 @@ class FetcherNetworkTest(FetcherTest): | |||
1109 | """ Prevent regression on deeply nested submodules not being checked out properly, even though they were fetched. """ | 1109 | """ Prevent regression on deeply nested submodules not being checked out properly, even though they were fetched. """ |
1110 | 1110 | ||
1111 | # This repository also has submodules where the module (name), path and url do not align | 1111 | # This repository also has submodules where the module (name), path and url do not align |
1112 | url = "gitsm://github.com/azure/iotedge.git;protocol=https;rev=d76e0316c6f324345d77c48a83ce836d09392699" | 1112 | url = "gitsm://github.com/azure/iotedge.git;protocol=https;rev=d76e0316c6f324345d77c48a83ce836d09392699;branch=master" |
1113 | fetcher = bb.fetch.Fetch([url], self.d) | 1113 | fetcher = bb.fetch.Fetch([url], self.d) |
1114 | fetcher.download() | 1114 | fetcher.download() |
1115 | # Previous cwd has been deleted | 1115 | # Previous cwd has been deleted |
@@ -1215,43 +1215,43 @@ class SVNTest(FetcherTest): | |||
1215 | class TrustedNetworksTest(FetcherTest): | 1215 | class TrustedNetworksTest(FetcherTest): |
1216 | def test_trusted_network(self): | 1216 | def test_trusted_network(self): |
1217 | # Ensure trusted_network returns False when the host IS in the list. | 1217 | # Ensure trusted_network returns False when the host IS in the list. |
1218 | url = "git://Someserver.org/foo;rev=1" | 1218 | url = "git://Someserver.org/foo;rev=1;branch=master" |
1219 | self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org someserver.org server2.org server3.org") | 1219 | self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org someserver.org server2.org server3.org") |
1220 | self.assertTrue(bb.fetch.trusted_network(self.d, url)) | 1220 | self.assertTrue(bb.fetch.trusted_network(self.d, url)) |
1221 | 1221 | ||
1222 | def test_wild_trusted_network(self): | 1222 | def test_wild_trusted_network(self): |
1223 | # Ensure trusted_network returns true when the *.host IS in the list. | 1223 | # Ensure trusted_network returns true when the *.host IS in the list. |
1224 | url = "git://Someserver.org/foo;rev=1" | 1224 | url = "git://Someserver.org/foo;rev=1;branch=master" |
1225 | self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org *.someserver.org server2.org server3.org") | 1225 | self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org *.someserver.org server2.org server3.org") |
1226 | self.assertTrue(bb.fetch.trusted_network(self.d, url)) | 1226 | self.assertTrue(bb.fetch.trusted_network(self.d, url)) |
1227 | 1227 | ||
1228 | def test_prefix_wild_trusted_network(self): | 1228 | def test_prefix_wild_trusted_network(self): |
1229 | # Ensure trusted_network returns true when the prefix matches *.host. | 1229 | # Ensure trusted_network returns true when the prefix matches *.host. |
1230 | url = "git://git.Someserver.org/foo;rev=1" | 1230 | url = "git://git.Someserver.org/foo;rev=1;branch=master" |
1231 | self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org *.someserver.org server2.org server3.org") | 1231 | self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org *.someserver.org server2.org server3.org") |
1232 | self.assertTrue(bb.fetch.trusted_network(self.d, url)) | 1232 | self.assertTrue(bb.fetch.trusted_network(self.d, url)) |
1233 | 1233 | ||
1234 | def test_two_prefix_wild_trusted_network(self): | 1234 | def test_two_prefix_wild_trusted_network(self): |
1235 | # Ensure trusted_network returns true when the prefix matches *.host. | 1235 | # Ensure trusted_network returns true when the prefix matches *.host. |
1236 | url = "git://something.git.Someserver.org/foo;rev=1" | 1236 | url = "git://something.git.Someserver.org/foo;rev=1;branch=master" |
1237 | self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org *.someserver.org server2.org server3.org") | 1237 | self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org *.someserver.org server2.org server3.org") |
1238 | self.assertTrue(bb.fetch.trusted_network(self.d, url)) | 1238 | self.assertTrue(bb.fetch.trusted_network(self.d, url)) |
1239 | 1239 | ||
1240 | def test_port_trusted_network(self): | 1240 | def test_port_trusted_network(self): |
1241 | # Ensure trusted_network returns True, even if the url specifies a port. | 1241 | # Ensure trusted_network returns True, even if the url specifies a port. |
1242 | url = "git://someserver.org:8080/foo;rev=1" | 1242 | url = "git://someserver.org:8080/foo;rev=1;branch=master" |
1243 | self.d.setVar("BB_ALLOWED_NETWORKS", "someserver.org") | 1243 | self.d.setVar("BB_ALLOWED_NETWORKS", "someserver.org") |
1244 | self.assertTrue(bb.fetch.trusted_network(self.d, url)) | 1244 | self.assertTrue(bb.fetch.trusted_network(self.d, url)) |
1245 | 1245 | ||
1246 | def test_untrusted_network(self): | 1246 | def test_untrusted_network(self): |
1247 | # Ensure trusted_network returns False when the host is NOT in the list. | 1247 | # Ensure trusted_network returns False when the host is NOT in the list. |
1248 | url = "git://someserver.org/foo;rev=1" | 1248 | url = "git://someserver.org/foo;rev=1;branch=master" |
1249 | self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org server2.org server3.org") | 1249 | self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org server2.org server3.org") |
1250 | self.assertFalse(bb.fetch.trusted_network(self.d, url)) | 1250 | self.assertFalse(bb.fetch.trusted_network(self.d, url)) |
1251 | 1251 | ||
1252 | def test_wild_untrusted_network(self): | 1252 | def test_wild_untrusted_network(self): |
1253 | # Ensure trusted_network returns False when the host is NOT in the list. | 1253 | # Ensure trusted_network returns False when the host is NOT in the list. |
1254 | url = "git://*.someserver.org/foo;rev=1" | 1254 | url = "git://*.someserver.org/foo;rev=1;branch=master" |
1255 | self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org server2.org server3.org") | 1255 | self.d.setVar("BB_ALLOWED_NETWORKS", "server1.org server2.org server3.org") |
1256 | self.assertFalse(bb.fetch.trusted_network(self.d, url)) | 1256 | self.assertFalse(bb.fetch.trusted_network(self.d, url)) |
1257 | 1257 | ||
@@ -1289,32 +1289,32 @@ class FetchLatestVersionTest(FetcherTest): | |||
1289 | : "1.99.4", | 1289 | : "1.99.4", |
1290 | # version pattern "vX.Y" | 1290 | # version pattern "vX.Y" |
1291 | # mirror of git.infradead.org since network issues interfered with testing | 1291 | # mirror of git.infradead.org since network issues interfered with testing |
1292 | ("mtd-utils", "git://git.yoctoproject.org/mtd-utils.git", "ca39eb1d98e736109c64ff9c1aa2a6ecca222d8f", "") | 1292 | ("mtd-utils", "git://git.yoctoproject.org/mtd-utils.git;branch=master", "ca39eb1d98e736109c64ff9c1aa2a6ecca222d8f", "") |
1293 | : "1.5.0", | 1293 | : "1.5.0", |
1294 | # version pattern "pkg_name-X.Y" | 1294 | # version pattern "pkg_name-X.Y" |
1295 | # mirror of git://anongit.freedesktop.org/git/xorg/proto/presentproto since network issues interfered with testing | 1295 | # mirror of git://anongit.freedesktop.org/git/xorg/proto/presentproto since network issues interfered with testing |
1296 | ("presentproto", "git://git.yoctoproject.org/bbfetchtests-presentproto", "24f3a56e541b0a9e6c6ee76081f441221a120ef9", "") | 1296 | ("presentproto", "git://git.yoctoproject.org/bbfetchtests-presentproto;branch=master", "24f3a56e541b0a9e6c6ee76081f441221a120ef9", "") |
1297 | : "1.0", | 1297 | : "1.0", |
1298 | # version pattern "pkg_name-vX.Y.Z" | 1298 | # version pattern "pkg_name-vX.Y.Z" |
1299 | ("dtc", "git://git.yoctoproject.org/bbfetchtests-dtc.git", "65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf", "") | 1299 | ("dtc", "git://git.yoctoproject.org/bbfetchtests-dtc.git;branch=master", "65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf", "") |
1300 | : "1.4.0", | 1300 | : "1.4.0", |
1301 | # combination version pattern | 1301 | # combination version pattern |
1302 | ("sysprof", "git://gitlab.gnome.org/GNOME/sysprof.git;protocol=https", "cd44ee6644c3641507fb53b8a2a69137f2971219", "") | 1302 | ("sysprof", "git://gitlab.gnome.org/GNOME/sysprof.git;protocol=https;branch=master", "cd44ee6644c3641507fb53b8a2a69137f2971219", "") |
1303 | : "1.2.0", | 1303 | : "1.2.0", |
1304 | ("u-boot-mkimage", "git://git.denx.de/u-boot.git;branch=master;protocol=git", "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c", "") | 1304 | ("u-boot-mkimage", "git://git.denx.de/u-boot.git;branch=master;protocol=git", "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c", "") |
1305 | : "2014.01", | 1305 | : "2014.01", |
1306 | # version pattern "yyyymmdd" | 1306 | # version pattern "yyyymmdd" |
1307 | ("mobile-broadband-provider-info", "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https", "4ed19e11c2975105b71b956440acdb25d46a347d", "") | 1307 | ("mobile-broadband-provider-info", "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=master", "4ed19e11c2975105b71b956440acdb25d46a347d", "") |
1308 | : "20120614", | 1308 | : "20120614", |
1309 | # packages with a valid UPSTREAM_CHECK_GITTAGREGEX | 1309 | # packages with a valid UPSTREAM_CHECK_GITTAGREGEX |
1310 | # mirror of git://anongit.freedesktop.org/xorg/driver/xf86-video-omap since network issues interfered with testing | 1310 | # mirror of git://anongit.freedesktop.org/xorg/driver/xf86-video-omap since network issues interfered with testing |
1311 | ("xf86-video-omap", "git://git.yoctoproject.org/bbfetchtests-xf86-video-omap", "ae0394e687f1a77e966cf72f895da91840dffb8f", r"(?P<pver>(\d+\.(\d\.?)*))") | 1311 | ("xf86-video-omap", "git://git.yoctoproject.org/bbfetchtests-xf86-video-omap;branch=master", "ae0394e687f1a77e966cf72f895da91840dffb8f", r"(?P<pver>(\d+\.(\d\.?)*))") |
1312 | : "0.4.3", | 1312 | : "0.4.3", |
1313 | ("build-appliance-image", "git://git.yoctoproject.org/poky", "b37dd451a52622d5b570183a81583cc34c2ff555", r"(?P<pver>(([0-9][\.|_]?)+[0-9]))") | 1313 | ("build-appliance-image", "git://git.yoctoproject.org/poky;branch=master", "b37dd451a52622d5b570183a81583cc34c2ff555", r"(?P<pver>(([0-9][\.|_]?)+[0-9]))") |
1314 | : "11.0.0", | 1314 | : "11.0.0", |
1315 | ("chkconfig-alternatives-native", "git://github.com/kergoth/chkconfig;branch=sysroot;protocol=https", "cd437ecbd8986c894442f8fce1e0061e20f04dee", r"chkconfig\-(?P<pver>((\d+[\.\-_]*)+))") | 1315 | ("chkconfig-alternatives-native", "git://github.com/kergoth/chkconfig;branch=sysroot;protocol=https", "cd437ecbd8986c894442f8fce1e0061e20f04dee", r"chkconfig\-(?P<pver>((\d+[\.\-_]*)+))") |
1316 | : "1.3.59", | 1316 | : "1.3.59", |
1317 | ("remake", "git://github.com/rocky/remake.git;protocol=https", "f05508e521987c8494c92d9c2871aec46307d51d", r"(?P<pver>(\d+\.(\d+\.)*\d*(\+dbg\d+(\.\d+)*)*))") | 1317 | ("remake", "git://github.com/rocky/remake.git;protocol=https;branch=master", "f05508e521987c8494c92d9c2871aec46307d51d", r"(?P<pver>(\d+\.(\d+\.)*\d*(\+dbg\d+(\.\d+)*)*))") |
1318 | : "3.82+dbg0.9", | 1318 | : "3.82+dbg0.9", |
1319 | } | 1319 | } |
1320 | 1320 | ||
@@ -1573,7 +1573,7 @@ class GitShallowTest(FetcherTest): | |||
1573 | self.d.delVar('PREMIRRORS') | 1573 | self.d.delVar('PREMIRRORS') |
1574 | self.d.delVar('MIRRORS') | 1574 | self.d.delVar('MIRRORS') |
1575 | 1575 | ||
1576 | uri = 'git://%s;protocol=file;subdir=${S}' % self.srcdir | 1576 | uri = 'git://%s;protocol=file;subdir=${S};branch=master' % self.srcdir |
1577 | self.d.setVar('SRC_URI', uri) | 1577 | self.d.setVar('SRC_URI', uri) |
1578 | self.d.setVar('SRCREV', '${AUTOREV}') | 1578 | self.d.setVar('SRCREV', '${AUTOREV}') |
1579 | self.d.setVar('AUTOREV', '${@bb.fetch2.get_autorev(d)}') | 1579 | self.d.setVar('AUTOREV', '${@bb.fetch2.get_autorev(d)}') |
@@ -1804,7 +1804,7 @@ class GitShallowTest(FetcherTest): | |||
1804 | self.git('submodule update', cwd=self.srcdir) | 1804 | self.git('submodule update', cwd=self.srcdir) |
1805 | self.git('commit -m submodule -a', cwd=self.srcdir) | 1805 | self.git('commit -m submodule -a', cwd=self.srcdir) |
1806 | 1806 | ||
1807 | uri = 'gitsm://%s;protocol=file;subdir=${S}' % self.srcdir | 1807 | uri = 'gitsm://%s;protocol=file;subdir=${S};branch=master' % self.srcdir |
1808 | fetcher, ud = self.fetch_shallow(uri) | 1808 | fetcher, ud = self.fetch_shallow(uri) |
1809 | 1809 | ||
1810 | # Verify the main repository is shallow | 1810 | # Verify the main repository is shallow |
@@ -1868,7 +1868,7 @@ class GitShallowTest(FetcherTest): | |||
1868 | self.git('commit --author "Foo Bar <foo@bar>" -m annex-c -a', cwd=self.srcdir) | 1868 | self.git('commit --author "Foo Bar <foo@bar>" -m annex-c -a', cwd=self.srcdir) |
1869 | bb.process.run('chmod u+w -R %s' % self.srcdir) | 1869 | bb.process.run('chmod u+w -R %s' % self.srcdir) |
1870 | 1870 | ||
1871 | uri = 'gitannex://%s;protocol=file;subdir=${S}' % self.srcdir | 1871 | uri = 'gitannex://%s;protocol=file;subdir=${S};branch=master' % self.srcdir |
1872 | fetcher, ud = self.fetch_shallow(uri) | 1872 | fetcher, ud = self.fetch_shallow(uri) |
1873 | 1873 | ||
1874 | self.assertRevCount(1) | 1874 | self.assertRevCount(1) |
@@ -2115,7 +2115,7 @@ class GitShallowTest(FetcherTest): | |||
2115 | self.d.setVar('SRCREV', 'e5939ff608b95cdd4d0ab0e1935781ab9a276ac0') | 2115 | self.d.setVar('SRCREV', 'e5939ff608b95cdd4d0ab0e1935781ab9a276ac0') |
2116 | self.d.setVar('BB_GIT_SHALLOW', '1') | 2116 | self.d.setVar('BB_GIT_SHALLOW', '1') |
2117 | self.d.setVar('BB_GENERATE_SHALLOW_TARBALLS', '1') | 2117 | self.d.setVar('BB_GENERATE_SHALLOW_TARBALLS', '1') |
2118 | fetcher = bb.fetch.Fetch(["git://git.yoctoproject.org/fstests"], self.d) | 2118 | fetcher = bb.fetch.Fetch(["git://git.yoctoproject.org/fstests;branch=master"], self.d) |
2119 | fetcher.download() | 2119 | fetcher.download() |
2120 | 2120 | ||
2121 | bb.utils.remove(self.dldir + "/*.tar.gz") | 2121 | bb.utils.remove(self.dldir + "/*.tar.gz") |
@@ -2160,7 +2160,7 @@ class GitLfsTest(FetcherTest): | |||
2160 | def test_lfs_enabled(self): | 2160 | def test_lfs_enabled(self): |
2161 | import shutil | 2161 | import shutil |
2162 | 2162 | ||
2163 | uri = 'git://%s;protocol=file;lfs=1' % self.srcdir | 2163 | uri = 'git://%s;protocol=file;lfs=1;branch=master' % self.srcdir |
2164 | self.d.setVar('SRC_URI', uri) | 2164 | self.d.setVar('SRC_URI', uri) |
2165 | 2165 | ||
2166 | # Careful: suppress initial attempt at downloading until | 2166 | # Careful: suppress initial attempt at downloading until |
@@ -2185,7 +2185,7 @@ class GitLfsTest(FetcherTest): | |||
2185 | def test_lfs_disabled(self): | 2185 | def test_lfs_disabled(self): |
2186 | import shutil | 2186 | import shutil |
2187 | 2187 | ||
2188 | uri = 'git://%s;protocol=file;lfs=0' % self.srcdir | 2188 | uri = 'git://%s;protocol=file;lfs=0;branch=master' % self.srcdir |
2189 | self.d.setVar('SRC_URI', uri) | 2189 | self.d.setVar('SRC_URI', uri) |
2190 | 2190 | ||
2191 | # In contrast to test_lfs_enabled(), allow the implicit download | 2191 | # In contrast to test_lfs_enabled(), allow the implicit download |
@@ -2209,13 +2209,13 @@ class GitLfsTest(FetcherTest): | |||
2209 | 2209 | ||
2210 | class GitURLWithSpacesTest(FetcherTest): | 2210 | class GitURLWithSpacesTest(FetcherTest): |
2211 | test_git_urls = { | 2211 | test_git_urls = { |
2212 | "git://tfs-example.org:22/tfs/example%20path/example.git" : { | 2212 | "git://tfs-example.org:22/tfs/example%20path/example.git;branch=master" : { |
2213 | 'url': 'git://tfs-example.org:22/tfs/example%20path/example.git', | 2213 | 'url': 'git://tfs-example.org:22/tfs/example%20path/example.git;branch=master', |
2214 | 'gitsrcname': 'tfs-example.org.22.tfs.example_path.example.git', | 2214 | 'gitsrcname': 'tfs-example.org.22.tfs.example_path.example.git', |
2215 | 'path': '/tfs/example path/example.git' | 2215 | 'path': '/tfs/example path/example.git' |
2216 | }, | 2216 | }, |
2217 | "git://tfs-example.org:22/tfs/example%20path/example%20repo.git" : { | 2217 | "git://tfs-example.org:22/tfs/example%20path/example%20repo.git;branch=master" : { |
2218 | 'url': 'git://tfs-example.org:22/tfs/example%20path/example%20repo.git', | 2218 | 'url': 'git://tfs-example.org:22/tfs/example%20path/example%20repo.git;branch=master', |
2219 | 'gitsrcname': 'tfs-example.org.22.tfs.example_path.example_repo.git', | 2219 | 'gitsrcname': 'tfs-example.org.22.tfs.example_path.example_repo.git', |
2220 | 'path': '/tfs/example path/example repo.git' | 2220 | 'path': '/tfs/example path/example repo.git' |
2221 | } | 2221 | } |
@@ -2744,7 +2744,7 @@ class NPMTest(FetcherTest): | |||
2744 | class GitSharedTest(FetcherTest): | 2744 | class GitSharedTest(FetcherTest): |
2745 | def setUp(self): | 2745 | def setUp(self): |
2746 | super(GitSharedTest, self).setUp() | 2746 | super(GitSharedTest, self).setUp() |
2747 | self.recipe_url = "git://git.openembedded.org/bitbake" | 2747 | self.recipe_url = "git://git.openembedded.org/bitbake;branch=master" |
2748 | self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40') | 2748 | self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40') |
2749 | 2749 | ||
2750 | @skipIfNoNetwork() | 2750 | @skipIfNoNetwork() |