summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/tests
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-26 17:49:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:34:38 +0000
commitab7b7bf94da653121baf7b1f6de9f11c8d4987e8 (patch)
treef950872862b008879e007c953b91efe4d857ac91 /bitbake/lib/bb/tests
parent06b4d8ffe4ee446b93243c7cf76c122ec836929d (diff)
downloadpoky-ab7b7bf94da653121baf7b1f6de9f11c8d4987e8.tar.gz
bitbake: fetch2/__init__: Fix decodeurl to better handle urls without paths
If we specify urls such as npm://somehost;someparams the fetcher currently does a poor job of handling mirrors of these urls due to deficiencies in the way decodeurl works. This is because "somehost" is returned as a path, not a host. This tweaks the code so that unless its a file url, the host is returned correctly. This patch also adds test cases for these urls to the exist set of test urls. We need to tweak the URI() class since this thinks this is a relative url which is clearly isn't. We also need to handle the fact that encodeurl will error if passed a url of this form (it would want the path to be '/'. (Bitbake rev: 83203cd2e677706e0111892a7843b83263cb8bd9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/tests')
-rw-r--r--bitbake/lib/bb/tests/fetch.py42
1 files changed, 40 insertions, 2 deletions
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py
index 81b22d025f..d8a36836d6 100644
--- a/bitbake/lib/bb/tests/fetch.py
+++ b/bitbake/lib/bb/tests/fetch.py
@@ -228,7 +228,38 @@ class URITest(unittest.TestCase):
228 'params': {}, 228 'params': {},
229 'query': {}, 229 'query': {},
230 'relative': False 230 'relative': False
231 },
232 "http://somesite.net;someparam=1": {
233 'uri': 'http://somesite.net;someparam=1',
234 'scheme': 'http',
235 'hostname': 'somesite.net',
236 'port': None,
237 'hostport': 'somesite.net',
238 'path': '',
239 'userinfo': '',
240 'userinfo': '',
241 'username': '',
242 'password': '',
243 'params': {"someparam" : "1"},
244 'query': {},
245 'relative': False
246 },
247 "file://somelocation;someparam=1": {
248 'uri': 'file:somelocation;someparam=1',
249 'scheme': 'file',
250 'hostname': '',
251 'port': None,
252 'hostport': '',
253 'path': 'somelocation',
254 'userinfo': '',
255 'userinfo': '',
256 'username': '',
257 'password': '',
258 'params': {"someparam" : "1"},
259 'query': {},
260 'relative': True
231 } 261 }
262
232 } 263 }
233 264
234 def test_uri(self): 265 def test_uri(self):
@@ -627,11 +658,18 @@ class URLHandle(unittest.TestCase):
627 "http://www.google.com/index.html" : ('http', 'www.google.com', '/index.html', '', '', {}), 658 "http://www.google.com/index.html" : ('http', 'www.google.com', '/index.html', '', '', {}),
628 "cvs://anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', '', {'module': 'familiar/dist/ipkg'}), 659 "cvs://anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', '', {'module': 'familiar/dist/ipkg'}),
629 "cvs://anoncvs:anonymous@cvs.handhelds.org/cvs;tag=V0-99-81;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', 'anonymous', {'tag': 'V0-99-81', 'module': 'familiar/dist/ipkg'}), 660 "cvs://anoncvs:anonymous@cvs.handhelds.org/cvs;tag=V0-99-81;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', 'anonymous', {'tag': 'V0-99-81', 'module': 'familiar/dist/ipkg'}),
630 "git://git.openembedded.org/bitbake;branch=@foo" : ('git', 'git.openembedded.org', '/bitbake', '', '', {'branch': '@foo'}) 661 "git://git.openembedded.org/bitbake;branch=@foo" : ('git', 'git.openembedded.org', '/bitbake', '', '', {'branch': '@foo'}),
662 "file://somelocation;someparam=1": ('file', '', 'somelocation', '', '', {'someparam': '1'}),
631 } 663 }
664 # we require a pathname to encodeurl but users can still pass such urls to
665 # decodeurl and we need to handle them
666 decodedata = datatable.copy()
667 decodedata.update({
668 "http://somesite.net;someparam=1": ('http', 'somesite.net', '', '', '', {'someparam': '1'}),
669 })
632 670
633 def test_decodeurl(self): 671 def test_decodeurl(self):
634 for k, v in self.datatable.items(): 672 for k, v in self.decodedata.items():
635 result = bb.fetch.decodeurl(k) 673 result = bb.fetch.decodeurl(k)
636 self.assertEqual(result, v) 674 self.assertEqual(result, v)
637 675