diff options
-rw-r--r-- | bitbake/lib/bb/tests/fetch.py | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index 6ef0836f2b..532adb9414 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py | |||
@@ -535,7 +535,7 @@ class MirrorUriTest(FetcherTest): | |||
535 | class GitDownloadDirectoryNamingTest(FetcherTest): | 535 | class GitDownloadDirectoryNamingTest(FetcherTest): |
536 | def setUp(self): | 536 | def setUp(self): |
537 | super(GitDownloadDirectoryNamingTest, self).setUp() | 537 | super(GitDownloadDirectoryNamingTest, self).setUp() |
538 | self.recipe_url = "git://git.openembedded.org/bitbake;branch=master" | 538 | self.recipe_url = "git://git.openembedded.org/bitbake;branch=master;protocol=https" |
539 | self.recipe_dir = "git.openembedded.org.bitbake" | 539 | self.recipe_dir = "git.openembedded.org.bitbake" |
540 | self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master" | 540 | self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master" |
541 | self.mirror_dir = "github.com.openembedded.bitbake.git" | 541 | self.mirror_dir = "github.com.openembedded.bitbake.git" |
@@ -583,7 +583,7 @@ class GitDownloadDirectoryNamingTest(FetcherTest): | |||
583 | class TarballNamingTest(FetcherTest): | 583 | class TarballNamingTest(FetcherTest): |
584 | def setUp(self): | 584 | def setUp(self): |
585 | super(TarballNamingTest, self).setUp() | 585 | super(TarballNamingTest, self).setUp() |
586 | self.recipe_url = "git://git.openembedded.org/bitbake;branch=master" | 586 | self.recipe_url = "git://git.openembedded.org/bitbake;branch=master;protocol=https" |
587 | self.recipe_tarball = "git2_git.openembedded.org.bitbake.tar.gz" | 587 | self.recipe_tarball = "git2_git.openembedded.org.bitbake.tar.gz" |
588 | self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master" | 588 | self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master" |
589 | self.mirror_tarball = "git2_github.com.openembedded.bitbake.git.tar.gz" | 589 | self.mirror_tarball = "git2_github.com.openembedded.bitbake.git.tar.gz" |
@@ -617,7 +617,7 @@ class TarballNamingTest(FetcherTest): | |||
617 | class GitShallowTarballNamingTest(FetcherTest): | 617 | class GitShallowTarballNamingTest(FetcherTest): |
618 | def setUp(self): | 618 | def setUp(self): |
619 | super(GitShallowTarballNamingTest, self).setUp() | 619 | super(GitShallowTarballNamingTest, self).setUp() |
620 | self.recipe_url = "git://git.openembedded.org/bitbake;branch=master" | 620 | self.recipe_url = "git://git.openembedded.org/bitbake;branch=master;protocol=https" |
621 | self.recipe_tarball = "gitshallow_git.openembedded.org.bitbake_82ea737-1_master.tar.gz" | 621 | self.recipe_tarball = "gitshallow_git.openembedded.org.bitbake_82ea737-1_master.tar.gz" |
622 | self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master" | 622 | self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https;branch=master" |
623 | self.mirror_tarball = "gitshallow_github.com.openembedded.bitbake.git_82ea737-1_master.tar.gz" | 623 | self.mirror_tarball = "gitshallow_github.com.openembedded.bitbake.git_82ea737-1_master.tar.gz" |
@@ -652,7 +652,7 @@ class GitShallowTarballNamingTest(FetcherTest): | |||
652 | class CleanTarballTest(FetcherTest): | 652 | class CleanTarballTest(FetcherTest): |
653 | def setUp(self): | 653 | def setUp(self): |
654 | super(CleanTarballTest, self).setUp() | 654 | super(CleanTarballTest, self).setUp() |
655 | self.recipe_url = "git://git.openembedded.org/bitbake" | 655 | self.recipe_url = "git://git.openembedded.org/bitbake;protocol=https" |
656 | self.recipe_tarball = "git2_git.openembedded.org.bitbake.tar.gz" | 656 | self.recipe_tarball = "git2_git.openembedded.org.bitbake.tar.gz" |
657 | 657 | ||
658 | self.d.setVar('BB_GENERATE_MIRROR_TARBALLS', '1') | 658 | self.d.setVar('BB_GENERATE_MIRROR_TARBALLS', '1') |
@@ -1011,25 +1011,25 @@ class FetcherNetworkTest(FetcherTest): | |||
1011 | 1011 | ||
1012 | @skipIfNoNetwork() | 1012 | @skipIfNoNetwork() |
1013 | def test_gitfetch(self): | 1013 | def test_gitfetch(self): |
1014 | url1 = url2 = "git://git.openembedded.org/bitbake;branch=master" | 1014 | url1 = url2 = "git://git.openembedded.org/bitbake;branch=master;protocol=https" |
1015 | self.gitfetcher(url1, url2) | 1015 | self.gitfetcher(url1, url2) |
1016 | 1016 | ||
1017 | @skipIfNoNetwork() | 1017 | @skipIfNoNetwork() |
1018 | def test_gitfetch_goodsrcrev(self): | 1018 | def test_gitfetch_goodsrcrev(self): |
1019 | # SRCREV is set but matches rev= parameter | 1019 | # SRCREV is set but matches rev= parameter |
1020 | url1 = url2 = "git://git.openembedded.org/bitbake;rev=270a05b0b4ba0959fe0624d2a4885d7b70426da5;branch=master" | 1020 | url1 = url2 = "git://git.openembedded.org/bitbake;rev=270a05b0b4ba0959fe0624d2a4885d7b70426da5;branch=master;protocol=https" |
1021 | self.gitfetcher(url1, url2) | 1021 | self.gitfetcher(url1, url2) |
1022 | 1022 | ||
1023 | @skipIfNoNetwork() | 1023 | @skipIfNoNetwork() |
1024 | def test_gitfetch_badsrcrev(self): | 1024 | def test_gitfetch_badsrcrev(self): |
1025 | # SRCREV is set but does not match rev= parameter | 1025 | # SRCREV is set but does not match rev= parameter |
1026 | url1 = url2 = "git://git.openembedded.org/bitbake;rev=dead05b0b4ba0959fe0624d2a4885d7b70426da5;branch=master" | 1026 | url1 = url2 = "git://git.openembedded.org/bitbake;rev=dead05b0b4ba0959fe0624d2a4885d7b70426da5;branch=master;protocol=https" |
1027 | self.assertRaises(bb.fetch.FetchError, self.gitfetcher, url1, url2) | 1027 | self.assertRaises(bb.fetch.FetchError, self.gitfetcher, url1, url2) |
1028 | 1028 | ||
1029 | @skipIfNoNetwork() | 1029 | @skipIfNoNetwork() |
1030 | def test_gitfetch_tagandrev(self): | 1030 | def test_gitfetch_tagandrev(self): |
1031 | # SRCREV is set but does not match rev= parameter | 1031 | # SRCREV is set but does not match rev= parameter |
1032 | url1 = url2 = "git://git.openembedded.org/bitbake;rev=270a05b0b4ba0959fe0624d2a4885d7b70426da5;tag=270a05b0b4ba0959fe0624d2a4885d7b70426da5" | 1032 | url1 = url2 = "git://git.openembedded.org/bitbake;rev=270a05b0b4ba0959fe0624d2a4885d7b70426da5;tag=270a05b0b4ba0959fe0624d2a4885d7b70426da5;protocol=https" |
1033 | self.assertRaises(bb.fetch.FetchError, self.gitfetcher, url1, url2) | 1033 | self.assertRaises(bb.fetch.FetchError, self.gitfetcher, url1, url2) |
1034 | 1034 | ||
1035 | @skipIfNoNetwork() | 1035 | @skipIfNoNetwork() |
@@ -1038,7 +1038,7 @@ class FetcherNetworkTest(FetcherTest): | |||
1038 | # `usehead=1' and instead fetch the specified SRCREV. See | 1038 | # `usehead=1' and instead fetch the specified SRCREV. See |
1039 | # test_local_gitfetch_usehead() for a positive use of the usehead | 1039 | # test_local_gitfetch_usehead() for a positive use of the usehead |
1040 | # feature. | 1040 | # feature. |
1041 | url = "git://git.openembedded.org/bitbake;usehead=1;branch=master" | 1041 | url = "git://git.openembedded.org/bitbake;usehead=1;branch=master;protocol=https" |
1042 | self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url) | 1042 | self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url) |
1043 | 1043 | ||
1044 | @skipIfNoNetwork() | 1044 | @skipIfNoNetwork() |
@@ -1047,26 +1047,26 @@ class FetcherNetworkTest(FetcherTest): | |||
1047 | # `usehead=1' and instead fetch the specified SRCREV. See | 1047 | # `usehead=1' and instead fetch the specified SRCREV. See |
1048 | # test_local_gitfetch_usehead() for a positive use of the usehead | 1048 | # test_local_gitfetch_usehead() for a positive use of the usehead |
1049 | # feature. | 1049 | # feature. |
1050 | url = "git://git.openembedded.org/bitbake;usehead=1;name=newName;branch=master" | 1050 | url = "git://git.openembedded.org/bitbake;usehead=1;name=newName;branch=master;protocol=https" |
1051 | self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url) | 1051 | self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url) |
1052 | 1052 | ||
1053 | @skipIfNoNetwork() | 1053 | @skipIfNoNetwork() |
1054 | def test_gitfetch_finds_local_tarball_for_mirrored_url_when_previous_downloaded_by_the_recipe_url(self): | 1054 | def test_gitfetch_finds_local_tarball_for_mirrored_url_when_previous_downloaded_by_the_recipe_url(self): |
1055 | recipeurl = "git://git.openembedded.org/bitbake;branch=master" | 1055 | recipeurl = "git://git.openembedded.org/bitbake;branch=master;protocol=https" |
1056 | mirrorurl = "git://someserver.org/bitbake;branch=master" | 1056 | mirrorurl = "git://someserver.org/bitbake;branch=master;protocol=https" |
1057 | self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake") | 1057 | self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake") |
1058 | self.gitfetcher(recipeurl, mirrorurl) | 1058 | self.gitfetcher(recipeurl, mirrorurl) |
1059 | 1059 | ||
1060 | @skipIfNoNetwork() | 1060 | @skipIfNoNetwork() |
1061 | def test_gitfetch_finds_local_tarball_when_previous_downloaded_from_a_premirror(self): | 1061 | def test_gitfetch_finds_local_tarball_when_previous_downloaded_from_a_premirror(self): |
1062 | recipeurl = "git://someserver.org/bitbake;branch=master" | 1062 | recipeurl = "git://someserver.org/bitbake;branch=master;protocol=https" |
1063 | self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake") | 1063 | self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake") |
1064 | self.gitfetcher(recipeurl, recipeurl) | 1064 | self.gitfetcher(recipeurl, recipeurl) |
1065 | 1065 | ||
1066 | @skipIfNoNetwork() | 1066 | @skipIfNoNetwork() |
1067 | def test_gitfetch_finds_local_repository_when_premirror_rewrites_the_recipe_url(self): | 1067 | def test_gitfetch_finds_local_repository_when_premirror_rewrites_the_recipe_url(self): |
1068 | realurl = "git://git.openembedded.org/bitbake" | 1068 | realurl = "https://git.openembedded.org/bitbake" |
1069 | recipeurl = "git://someserver.org/bitbake" | 1069 | recipeurl = "git://someserver.org/bitbake;protocol=https" |
1070 | self.sourcedir = self.unpackdir.replace("unpacked", "sourcemirror.git") | 1070 | self.sourcedir = self.unpackdir.replace("unpacked", "sourcemirror.git") |
1071 | os.chdir(self.tempdir) | 1071 | os.chdir(self.tempdir) |
1072 | self.git(['clone', realurl, self.sourcedir], cwd=self.tempdir) | 1072 | self.git(['clone', realurl, self.sourcedir], cwd=self.tempdir) |
@@ -1076,9 +1076,9 @@ class FetcherNetworkTest(FetcherTest): | |||
1076 | @skipIfNoNetwork() | 1076 | @skipIfNoNetwork() |
1077 | def test_git_submodule(self): | 1077 | def test_git_submodule(self): |
1078 | # URL with ssh submodules | 1078 | # URL with ssh submodules |
1079 | url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=ssh-gitsm-tests;rev=049da4a6cb198d7c0302e9e8b243a1443cb809a7;branch=master" | 1079 | url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=ssh-gitsm-tests;rev=049da4a6cb198d7c0302e9e8b243a1443cb809a7;branch=master;protocol=https" |
1080 | # Original URL (comment this if you have ssh access to git.yoctoproject.org) | 1080 | # Original URL (comment this if you have ssh access to git.yoctoproject.org) |
1081 | url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=master;rev=a2885dd7d25380d23627e7544b7bbb55014b16ee;branch=master" | 1081 | url = "gitsm://git.yoctoproject.org/git-submodule-test;branch=master;rev=a2885dd7d25380d23627e7544b7bbb55014b16ee;branch=master;protocol=https" |
1082 | fetcher = bb.fetch.Fetch([url], self.d) | 1082 | fetcher = bb.fetch.Fetch([url], self.d) |
1083 | fetcher.download() | 1083 | fetcher.download() |
1084 | # Previous cwd has been deleted | 1084 | # Previous cwd has been deleted |
@@ -1329,9 +1329,9 @@ class URLHandle(unittest.TestCase): | |||
1329 | "http://www.google.com/index.html" : ('http', 'www.google.com', '/index.html', '', '', {}), | 1329 | "http://www.google.com/index.html" : ('http', 'www.google.com', '/index.html', '', '', {}), |
1330 | "cvs://anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', '', {'module': 'familiar/dist/ipkg'}), | 1330 | "cvs://anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', '', {'module': 'familiar/dist/ipkg'}), |
1331 | "cvs://anoncvs:anonymous@cvs.handhelds.org/cvs;tag=V0-99-81;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', 'anonymous', collections.OrderedDict([('tag', 'V0-99-81'), ('module', 'familiar/dist/ipkg')])), | 1331 | "cvs://anoncvs:anonymous@cvs.handhelds.org/cvs;tag=V0-99-81;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', 'anonymous', collections.OrderedDict([('tag', 'V0-99-81'), ('module', 'familiar/dist/ipkg')])), |
1332 | "git://git.openembedded.org/bitbake;branch=@foo" : ('git', 'git.openembedded.org', '/bitbake', '', '', {'branch': '@foo'}), | 1332 | "git://git.openembedded.org/bitbake;branch=@foo;protocol=https" : ('git', 'git.openembedded.org', '/bitbake', '', '', {'branch': '@foo', 'protocol' : 'https'}), |
1333 | "file://somelocation;someparam=1": ('file', '', 'somelocation', '', '', {'someparam': '1'}), | 1333 | "file://somelocation;someparam=1": ('file', '', 'somelocation', '', '', {'someparam': '1'}), |
1334 | r'git://s.o-me_ONE:!#$%^&*()-_={}[]\|:?,.<>~`@git.openembedded.org/bitbake;branch=main': ('git', 'git.openembedded.org', '/bitbake', 's.o-me_ONE', r'!#$%^&*()-_={}[]\|:?,.<>~`', {'branch': 'main'}), | 1334 | r'git://s.o-me_ONE:!#$%^&*()-_={}[]\|:?,.<>~`@git.openembedded.org/bitbake;branch=main;protocol=https': ('git', 'git.openembedded.org', '/bitbake', 's.o-me_ONE', r'!#$%^&*()-_={}[]\|:?,.<>~`', {'branch': 'main', 'protocol' : 'https'}), |
1335 | } | 1335 | } |
1336 | # we require a pathname to encodeurl but users can still pass such urls to | 1336 | # we require a pathname to encodeurl but users can still pass such urls to |
1337 | # decodeurl and we need to handle them | 1337 | # decodeurl and we need to handle them |
@@ -1359,14 +1359,14 @@ class FetchLatestVersionTest(FetcherTest): | |||
1359 | : "1.99.4", | 1359 | : "1.99.4", |
1360 | # version pattern "vX.Y" | 1360 | # version pattern "vX.Y" |
1361 | # mirror of git.infradead.org since network issues interfered with testing | 1361 | # mirror of git.infradead.org since network issues interfered with testing |
1362 | ("mtd-utils", "git://git.yoctoproject.org/mtd-utils.git;branch=master", "ca39eb1d98e736109c64ff9c1aa2a6ecca222d8f", "") | 1362 | ("mtd-utils", "git://git.yoctoproject.org/mtd-utils.git;branch=master;protocol=https", "ca39eb1d98e736109c64ff9c1aa2a6ecca222d8f", "") |
1363 | : "1.5.0", | 1363 | : "1.5.0", |
1364 | # version pattern "pkg_name-X.Y" | 1364 | # version pattern "pkg_name-X.Y" |
1365 | # mirror of git://anongit.freedesktop.org/git/xorg/proto/presentproto since network issues interfered with testing | 1365 | # mirror of git://anongit.freedesktop.org/git/xorg/proto/presentproto since network issues interfered with testing |
1366 | ("presentproto", "git://git.yoctoproject.org/bbfetchtests-presentproto;branch=master", "24f3a56e541b0a9e6c6ee76081f441221a120ef9", "") | 1366 | ("presentproto", "git://git.yoctoproject.org/bbfetchtests-presentproto;branch=master;protocol=https", "24f3a56e541b0a9e6c6ee76081f441221a120ef9", "") |
1367 | : "1.0", | 1367 | : "1.0", |
1368 | # version pattern "pkg_name-vX.Y.Z" | 1368 | # version pattern "pkg_name-vX.Y.Z" |
1369 | ("dtc", "git://git.yoctoproject.org/bbfetchtests-dtc.git;branch=master", "65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf", "") | 1369 | ("dtc", "git://git.yoctoproject.org/bbfetchtests-dtc.git;branch=master;protocol=https", "65cc4d2748a2c2e6f27f1cf39e07a5dbabd80ebf", "") |
1370 | : "1.4.0", | 1370 | : "1.4.0", |
1371 | # combination version pattern | 1371 | # combination version pattern |
1372 | ("sysprof", "git://gitlab.gnome.org/GNOME/sysprof.git;protocol=https;branch=master", "cd44ee6644c3641507fb53b8a2a69137f2971219", "") | 1372 | ("sysprof", "git://gitlab.gnome.org/GNOME/sysprof.git;protocol=https;branch=master", "cd44ee6644c3641507fb53b8a2a69137f2971219", "") |
@@ -1378,9 +1378,9 @@ class FetchLatestVersionTest(FetcherTest): | |||
1378 | : "20120614", | 1378 | : "20120614", |
1379 | # packages with a valid UPSTREAM_CHECK_GITTAGREGEX | 1379 | # packages with a valid UPSTREAM_CHECK_GITTAGREGEX |
1380 | # mirror of git://anongit.freedesktop.org/xorg/driver/xf86-video-omap since network issues interfered with testing | 1380 | # mirror of git://anongit.freedesktop.org/xorg/driver/xf86-video-omap since network issues interfered with testing |
1381 | ("xf86-video-omap", "git://git.yoctoproject.org/bbfetchtests-xf86-video-omap;branch=master", "ae0394e687f1a77e966cf72f895da91840dffb8f", r"(?P<pver>(\d+\.(\d\.?)*))") | 1381 | ("xf86-video-omap", "git://git.yoctoproject.org/bbfetchtests-xf86-video-omap;branch=master;protocol=https", "ae0394e687f1a77e966cf72f895da91840dffb8f", r"(?P<pver>(\d+\.(\d\.?)*))") |
1382 | : "0.4.3", | 1382 | : "0.4.3", |
1383 | ("build-appliance-image", "git://git.yoctoproject.org/poky;branch=master", "b37dd451a52622d5b570183a81583cc34c2ff555", r"(?P<pver>(([0-9][\.|_]?)+[0-9]))") | 1383 | ("build-appliance-image", "git://git.yoctoproject.org/poky;branch=master;protocol=https", "b37dd451a52622d5b570183a81583cc34c2ff555", r"(?P<pver>(([0-9][\.|_]?)+[0-9]))") |
1384 | : "11.0.0", | 1384 | : "11.0.0", |
1385 | ("chkconfig-alternatives-native", "git://github.com/kergoth/chkconfig;branch=sysroot;protocol=https", "cd437ecbd8986c894442f8fce1e0061e20f04dee", r"chkconfig\-(?P<pver>((\d+[\.\-_]*)+))") | 1385 | ("chkconfig-alternatives-native", "git://github.com/kergoth/chkconfig;branch=sysroot;protocol=https", "cd437ecbd8986c894442f8fce1e0061e20f04dee", r"chkconfig\-(?P<pver>((\d+[\.\-_]*)+))") |
1386 | : "1.3.59", | 1386 | : "1.3.59", |
@@ -2189,7 +2189,7 @@ class GitShallowTest(FetcherTest): | |||
2189 | self.d.setVar('SRCREV', 'e5939ff608b95cdd4d0ab0e1935781ab9a276ac0') | 2189 | self.d.setVar('SRCREV', 'e5939ff608b95cdd4d0ab0e1935781ab9a276ac0') |
2190 | self.d.setVar('BB_GIT_SHALLOW', '1') | 2190 | self.d.setVar('BB_GIT_SHALLOW', '1') |
2191 | self.d.setVar('BB_GENERATE_SHALLOW_TARBALLS', '1') | 2191 | self.d.setVar('BB_GENERATE_SHALLOW_TARBALLS', '1') |
2192 | fetcher = bb.fetch.Fetch(["git://git.yoctoproject.org/fstests;branch=master"], self.d) | 2192 | fetcher = bb.fetch.Fetch(["git://git.yoctoproject.org/fstests;branch=master;protocol=https"], self.d) |
2193 | fetcher.download() | 2193 | fetcher.download() |
2194 | 2194 | ||
2195 | bb.utils.remove(self.dldir + "/*.tar.gz") | 2195 | bb.utils.remove(self.dldir + "/*.tar.gz") |
@@ -2966,7 +2966,7 @@ class NPMTest(FetcherTest): | |||
2966 | class GitSharedTest(FetcherTest): | 2966 | class GitSharedTest(FetcherTest): |
2967 | def setUp(self): | 2967 | def setUp(self): |
2968 | super(GitSharedTest, self).setUp() | 2968 | super(GitSharedTest, self).setUp() |
2969 | self.recipe_url = "git://git.openembedded.org/bitbake;branch=master" | 2969 | self.recipe_url = "git://git.openembedded.org/bitbake;branch=master;protocol=https" |
2970 | self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40') | 2970 | self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40') |
2971 | self.d.setVar("__BBSRCREV_SEEN", "1") | 2971 | self.d.setVar("__BBSRCREV_SEEN", "1") |
2972 | 2972 | ||
@@ -2999,7 +2999,7 @@ class FetchPremirroronlyLocalTest(FetcherTest): | |||
2999 | os.mkdir(self.mirrordir) | 2999 | os.mkdir(self.mirrordir) |
3000 | self.reponame = "bitbake" | 3000 | self.reponame = "bitbake" |
3001 | self.gitdir = os.path.join(self.tempdir, "git", self.reponame) | 3001 | self.gitdir = os.path.join(self.tempdir, "git", self.reponame) |
3002 | self.recipe_url = "git://git.fake.repo/bitbake;branch=master" | 3002 | self.recipe_url = "git://git.fake.repo/bitbake;branch=master;protocol=https" |
3003 | self.d.setVar("BB_FETCH_PREMIRRORONLY", "1") | 3003 | self.d.setVar("BB_FETCH_PREMIRRORONLY", "1") |
3004 | self.d.setVar("BB_NO_NETWORK", "1") | 3004 | self.d.setVar("BB_NO_NETWORK", "1") |
3005 | self.d.setVar("PREMIRRORS", self.recipe_url + " " + "file://{}".format(self.mirrordir) + " \n") | 3005 | self.d.setVar("PREMIRRORS", self.recipe_url + " " + "file://{}".format(self.mirrordir) + " \n") |
@@ -3053,7 +3053,7 @@ class FetchPremirroronlyNetworkTest(FetcherTest): | |||
3053 | self.reponame = "fstests" | 3053 | self.reponame = "fstests" |
3054 | self.clonedir = os.path.join(self.tempdir, "git") | 3054 | self.clonedir = os.path.join(self.tempdir, "git") |
3055 | self.gitdir = os.path.join(self.tempdir, "git", "{}.git".format(self.reponame)) | 3055 | self.gitdir = os.path.join(self.tempdir, "git", "{}.git".format(self.reponame)) |
3056 | self.recipe_url = "git://git.yoctoproject.org/fstests" | 3056 | self.recipe_url = "git://git.yoctoproject.org/fstests;protocol=https" |
3057 | self.d.setVar("BB_FETCH_PREMIRRORONLY", "1") | 3057 | self.d.setVar("BB_FETCH_PREMIRRORONLY", "1") |
3058 | self.d.setVar("BB_NO_NETWORK", "0") | 3058 | self.d.setVar("BB_NO_NETWORK", "0") |
3059 | self.d.setVar("PREMIRRORS", self.recipe_url + " " + "file://{}".format(self.mirrordir) + " \n") | 3059 | self.d.setVar("PREMIRRORS", self.recipe_url + " " + "file://{}".format(self.mirrordir) + " \n") |
@@ -3135,7 +3135,7 @@ class FetchPremirroronlyBrokenTarball(FetcherTest): | |||
3135 | os.mkdir(self.mirrordir) | 3135 | os.mkdir(self.mirrordir) |
3136 | self.reponame = "bitbake" | 3136 | self.reponame = "bitbake" |
3137 | self.gitdir = os.path.join(self.tempdir, "git", self.reponame) | 3137 | self.gitdir = os.path.join(self.tempdir, "git", self.reponame) |
3138 | self.recipe_url = "git://git.fake.repo/bitbake" | 3138 | self.recipe_url = "git://git.fake.repo/bitbake;protocol=https" |
3139 | self.d.setVar("BB_FETCH_PREMIRRORONLY", "1") | 3139 | self.d.setVar("BB_FETCH_PREMIRRORONLY", "1") |
3140 | self.d.setVar("BB_NO_NETWORK", "1") | 3140 | self.d.setVar("BB_NO_NETWORK", "1") |
3141 | self.d.setVar("PREMIRRORS", self.recipe_url + " " + "file://{}".format(self.mirrordir) + " \n") | 3141 | self.d.setVar("PREMIRRORS", self.recipe_url + " " + "file://{}".format(self.mirrordir) + " \n") |