diff options
author | Ross Burton <ross.burton@intel.com> | 2017-09-07 10:24:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:37:29 +0000 |
commit | 9351217eb78206bf0d4e801c9c33440f7b9ef41b (patch) | |
tree | 71c80fb473fd9c2ad47edf1b7d4fc52d8adb5d90 /bitbake | |
parent | 449062508890e369ec7a124a1b9ce9ba7dd90ba7 (diff) | |
download | poky-9351217eb78206bf0d4e801c9c33440f7b9ef41b.tar.gz |
bitbake: tests/fetch: handle network failures gracefully
If there is a network failure the return value from latest_versionstring() is
('','') which later causes an exception when comparing versions.
Improve this by checking the return value and failing the test early.
[ YOCTO #12053 ]
(Bitbake rev: 4284d918dc7451f6a4d00be065369e86bbaec4d2)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/tests/fetch.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index 0fd2c02163..5a8d892855 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py | |||
@@ -793,6 +793,7 @@ class FetchLatestVersionTest(FetcherTest): | |||
793 | ud = bb.fetch2.FetchData(k[1], self.d) | 793 | ud = bb.fetch2.FetchData(k[1], self.d) |
794 | pupver= ud.method.latest_versionstring(ud, self.d) | 794 | pupver= ud.method.latest_versionstring(ud, self.d) |
795 | verstring = pupver[0] | 795 | verstring = pupver[0] |
796 | self.assertTrue(verstring, msg="Could not find upstream version") | ||
796 | r = bb.utils.vercmp_string(v, verstring) | 797 | r = bb.utils.vercmp_string(v, verstring) |
797 | self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) | 798 | self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) |
798 | 799 | ||
@@ -804,6 +805,7 @@ class FetchLatestVersionTest(FetcherTest): | |||
804 | ud = bb.fetch2.FetchData(k[1], self.d) | 805 | ud = bb.fetch2.FetchData(k[1], self.d) |
805 | pupver = ud.method.latest_versionstring(ud, self.d) | 806 | pupver = ud.method.latest_versionstring(ud, self.d) |
806 | verstring = pupver[0] | 807 | verstring = pupver[0] |
808 | self.assertTrue(verstring, msg="Could not find upstream version") | ||
807 | r = bb.utils.vercmp_string(v, verstring) | 809 | r = bb.utils.vercmp_string(v, verstring) |
808 | self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) | 810 | self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) |
809 | 811 | ||