MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bitbake: bb/tests: use subtests when looping in a test case

Browse Source 
Marking the test iterations as subtests means that when one fails, it
can identify clearly which iteration has failed.

(Bitbake rev: 52c55e681332d7cdbe06f3c9d9c8d77cb0cb93f6)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2025-03-26 12:25:20 +00:00 committed by Richard Purdie
parent 3233f3b231
commit c3fc67960e
1 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
bitbake/lib/bb/tests/fetch.py
View File

@ -1534,18 +1534,19 @@ class FetchLatestVersionTest(FetcherTest):
@skipIfNoNetwork() @skipIfNoNetwork()
def test_git_latest_versionstring(self): def test_git_latest_versionstring(self):
for k, v in self.test_git_uris.items(): for k, v in self.test_git_uris.items():
self.d.setVar("PN", k[0]) with self.subTest(pn=k[0]):
self.d.setVar("SRCREV", k[2]) self.d.setVar("PN", k[0])
self.d.setVar("UPSTREAM_CHECK_GITTAGREGEX", k[3]) self.d.setVar("SRCREV", k[2])
ud = bb.fetch2.FetchData(k[1], self.d) self.d.setVar("UPSTREAM_CHECK_GITTAGREGEX", k[3])
pupver= ud.method.latest_versionstring(ud, self.d) ud = bb.fetch2.FetchData(k[1], self.d)
verstring = pupver[0] pupver= ud.method.latest_versionstring(ud, self.d)
self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0]) verstring = pupver[0]
r = bb.utils.vercmp_string(v, verstring) self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0])
self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) r = bb.utils.vercmp_string(v, verstring)
if k[4]: self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring))
r = bb.utils.vercmp_string(verstring, k[4]) if k[4]:
self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], verstring, k[4])) r = bb.utils.vercmp_string(verstring, k[4])
self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], verstring, k[4]))
def test_wget_latest_versionstring(self): def test_wget_latest_versionstring(self):
testdata = os.path.dirname(os.path.abspath(__file__)) + "/fetch-testdata" testdata = os.path.dirname(os.path.abspath(__file__)) + "/fetch-testdata"
@ -1554,32 +1555,34 @@ class FetchLatestVersionTest(FetcherTest):
port = server.port port = server.port
try: try:
for k, v in self.test_wget_uris.items(): for k, v in self.test_wget_uris.items():
self.d.setVar("PN", k[0]) with self.subTest(pn=k[0]):
checkuri = "" self.d.setVar("PN", k[0])
if k[2]: checkuri = ""
checkuri = "http://127.0.0.1:%s/" % port + k[2] if k[2]:
self.d.setVar("UPSTREAM_CHECK_URI", checkuri) checkuri = "http://127.0.0.1:%s/" % port + k[2]
self.d.setVar("UPSTREAM_CHECK_REGEX", k[3]) self.d.setVar("UPSTREAM_CHECK_URI", checkuri)
url = "http://127.0.0.1:%s/" % port + k[1] self.d.setVar("UPSTREAM_CHECK_REGEX", k[3])
ud = bb.fetch2.FetchData(url, self.d) url = "http://127.0.0.1:%s/" % port + k[1]
pupver = ud.method.latest_versionstring(ud, self.d) ud = bb.fetch2.FetchData(url, self.d)
verstring = pupver[0] pupver = ud.method.latest_versionstring(ud, self.d)
self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0]) verstring = pupver[0]
r = bb.utils.vercmp_string(v, verstring) self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0])
self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) r = bb.utils.vercmp_string(v, verstring)
self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring))
finally: finally:
server.stop() server.stop()
@skipIfNoNetwork() @skipIfNoNetwork()
def test_crate_latest_versionstring(self): def test_crate_latest_versionstring(self):
for k, v in self.test_crate_uris.items(): for k, v in self.test_crate_uris.items():
self.d.setVar("PN", k[0]) with self.subTest(pn=k[0]):
ud = bb.fetch2.FetchData(k[1], self.d) self.d.setVar("PN", k[0])
pupver = ud.method.latest_versionstring(ud, self.d) ud = bb.fetch2.FetchData(k[1], self.d)
verstring = pupver[0] pupver = ud.method.latest_versionstring(ud, self.d)
self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0]) verstring = pupver[0]
r = bb.utils.vercmp_string(v, verstring) self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0])
self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) r = bb.utils.vercmp_string(v, verstring)
self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring))
class FetchCheckStatusTest(FetcherTest): class FetchCheckStatusTest(FetcherTest):
test_wget_uris = ["https://downloads.yoctoproject.org/releases/sato/sato-engine-0.1.tar.gz", test_wget_uris = ["https://downloads.yoctoproject.org/releases/sato/sato-engine-0.1.tar.gz",