diff options
author | Urs Fässler <urs.fassler@bbv.ch> | 2018-10-15 13:43:20 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-18 10:59:26 +0100 |
commit | 9a058e442173b6de4b7be42ce433686eb679b95a (patch) | |
tree | b61fead0f629e52cd79670a43b1b5ff9a2647d71 /bitbake | |
parent | 36fcd5eda967dd5fb97b4fb6645dc8418e95c64b (diff) | |
download | poky-9a058e442173b6de4b7be42ce433686eb679b95a.tar.gz |
bitbake: fetch2/git: use intention revealing names for premirror tests
(Bitbake rev: 3434e64e7c077c1ecff7b36f02b6c6b59a7d1fe9)
Signed-off-by: Urs Fässler <urs.fassler@bbv.ch>
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-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 79be1be0b0..9bed06ba0e 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py | |||
@@ -869,27 +869,27 @@ class FetcherNetworkTest(FetcherTest): | |||
869 | self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url) | 869 | self.assertRaises(bb.fetch.ParameterError, self.gitfetcher, url, url) |
870 | 870 | ||
871 | @skipIfNoNetwork() | 871 | @skipIfNoNetwork() |
872 | def test_gitfetch_premirror(self): | 872 | def test_gitfetch_finds_local_tarball_for_mirrored_url_when_previous_downloaded_by_the_recipe_url(self): |
873 | url1 = "git://git.openembedded.org/bitbake" | 873 | recipeurl = "git://git.openembedded.org/bitbake" |
874 | url2 = "git://someserver.org/bitbake" | 874 | mirrorurl = "git://someserver.org/bitbake" |
875 | self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake \n") | 875 | self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake \n") |
876 | self.gitfetcher(url1, url2) | 876 | self.gitfetcher(recipeurl, mirrorurl) |
877 | 877 | ||
878 | @skipIfNoNetwork() | 878 | @skipIfNoNetwork() |
879 | def test_gitfetch_premirror2(self): | 879 | def test_gitfetch_finds_local_tarball_when_previous_downloaded_from_a_premirror(self): |
880 | url1 = url2 = "git://someserver.org/bitbake" | 880 | recipeurl = "git://someserver.org/bitbake" |
881 | self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake \n") | 881 | self.d.setVar("PREMIRRORS", "git://someserver.org/bitbake git://git.openembedded.org/bitbake \n") |
882 | self.gitfetcher(url1, url2) | 882 | self.gitfetcher(recipeurl, recipeurl) |
883 | 883 | ||
884 | @skipIfNoNetwork() | 884 | @skipIfNoNetwork() |
885 | def test_gitfetch_premirror3(self): | 885 | def test_gitfetch_finds_local_repository_when_premirror_rewrites_the_recipe_url(self): |
886 | realurl = "git://git.openembedded.org/bitbake" | 886 | realurl = "git://git.openembedded.org/bitbake" |
887 | dummyurl = "git://someserver.org/bitbake" | 887 | recipeurl = "git://someserver.org/bitbake" |
888 | self.sourcedir = self.unpackdir.replace("unpacked", "sourcemirror.git") | 888 | self.sourcedir = self.unpackdir.replace("unpacked", "sourcemirror.git") |
889 | os.chdir(self.tempdir) | 889 | os.chdir(self.tempdir) |
890 | bb.process.run("git clone %s %s 2> /dev/null" % (realurl, self.sourcedir), shell=True) | 890 | bb.process.run("git clone %s %s 2> /dev/null" % (realurl, self.sourcedir), shell=True) |
891 | self.d.setVar("PREMIRRORS", "%s git://%s;protocol=file \n" % (dummyurl, self.sourcedir)) | 891 | self.d.setVar("PREMIRRORS", "%s git://%s;protocol=file \n" % (recipeurl, self.sourcedir)) |
892 | self.gitfetcher(dummyurl, dummyurl) | 892 | self.gitfetcher(recipeurl, recipeurl) |
893 | 893 | ||
894 | @skipIfNoNetwork() | 894 | @skipIfNoNetwork() |
895 | def test_git_submodule(self): | 895 | def test_git_submodule(self): |