From: Ross Burton Date: Thu, 7 Sep 2017 09:24:25 +0000 (+0100) Subject: bitbake: tests/fetch: handle network failures gracefully X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96f258ba12d3184a631e846c73a23d131ebc6e7e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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: 3f034d2172bf64ecc43577b43e0cf032a54b1358) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index faa5c74aae0..209b13f6953 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py @@ -793,6 +793,7 @@ class FetchLatestVersionTest(FetcherTest): ud = bb.fetch2.FetchData(k[1], self.d) pupver= ud.method.latest_versionstring(ud, self.d) verstring = pupver[0] + self.assertTrue(verstring, msg="Could not find upstream version") r = bb.utils.vercmp_string(v, verstring) self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) @@ -804,6 +805,7 @@ class FetchLatestVersionTest(FetcherTest): ud = bb.fetch2.FetchData(k[1], self.d) pupver = ud.method.latest_versionstring(ud, self.d) verstring = pupver[0] + self.assertTrue(verstring, msg="Could not find upstream version") r = bb.utils.vercmp_string(v, verstring) self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring))