summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2025-03-26 12:25:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-27 13:40:31 +0000
commitc3fc67960e429a69f1090c2ab8d34b8ef7f5dfec (patch)
treee2885289ff4042e348b60cdc183c63126bec137e /bitbake
parent3233f3b23151685701d3ec905e8ce1ec069fa365 (diff)
downloadpoky-c3fc67960e429a69f1090c2ab8d34b8ef7f5dfec.tar.gz
bitbake: bb/tests: use subtests when looping in a test case
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>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/tests/fetch.py67
1 files changed, 35 insertions, 32 deletions
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py
index f2f140ff24..8f820c8136 100644
--- a/bitbake/lib/bb/tests/fetch.py
+++ b/bitbake/lib/bb/tests/fetch.py
@@ -1534,18 +1534,19 @@ class FetchLatestVersionTest(FetcherTest):
1534 @skipIfNoNetwork() 1534 @skipIfNoNetwork()
1535 def test_git_latest_versionstring(self): 1535 def test_git_latest_versionstring(self):
1536 for k, v in self.test_git_uris.items(): 1536 for k, v in self.test_git_uris.items():
1537 self.d.setVar("PN", k[0]) 1537 with self.subTest(pn=k[0]):
1538 self.d.setVar("SRCREV", k[2]) 1538 self.d.setVar("PN", k[0])
1539 self.d.setVar("UPSTREAM_CHECK_GITTAGREGEX", k[3]) 1539 self.d.setVar("SRCREV", k[2])
1540 ud = bb.fetch2.FetchData(k[1], self.d) 1540 self.d.setVar("UPSTREAM_CHECK_GITTAGREGEX", k[3])
1541 pupver= ud.method.latest_versionstring(ud, self.d) 1541 ud = bb.fetch2.FetchData(k[1], self.d)
1542 verstring = pupver[0] 1542 pupver= ud.method.latest_versionstring(ud, self.d)
1543 self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0]) 1543 verstring = pupver[0]
1544 r = bb.utils.vercmp_string(v, verstring) 1544 self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0])
1545 self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) 1545 r = bb.utils.vercmp_string(v, verstring)
1546 if k[4]: 1546 self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring))
1547 r = bb.utils.vercmp_string(verstring, k[4]) 1547 if k[4]:
1548 self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], verstring, k[4])) 1548 r = bb.utils.vercmp_string(verstring, k[4])
1549 self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], verstring, k[4]))
1549 1550
1550 def test_wget_latest_versionstring(self): 1551 def test_wget_latest_versionstring(self):
1551 testdata = os.path.dirname(os.path.abspath(__file__)) + "/fetch-testdata" 1552 testdata = os.path.dirname(os.path.abspath(__file__)) + "/fetch-testdata"
@@ -1554,32 +1555,34 @@ class FetchLatestVersionTest(FetcherTest):
1554 port = server.port 1555 port = server.port
1555 try: 1556 try:
1556 for k, v in self.test_wget_uris.items(): 1557 for k, v in self.test_wget_uris.items():
1557 self.d.setVar("PN", k[0]) 1558 with self.subTest(pn=k[0]):
1558 checkuri = "" 1559 self.d.setVar("PN", k[0])
1559 if k[2]: 1560 checkuri = ""
1560 checkuri = "http://127.0.0.1:%s/" % port + k[2] 1561 if k[2]:
1561 self.d.setVar("UPSTREAM_CHECK_URI", checkuri) 1562 checkuri = "http://127.0.0.1:%s/" % port + k[2]
1562 self.d.setVar("UPSTREAM_CHECK_REGEX", k[3]) 1563 self.d.setVar("UPSTREAM_CHECK_URI", checkuri)
1563 url = "http://127.0.0.1:%s/" % port + k[1] 1564 self.d.setVar("UPSTREAM_CHECK_REGEX", k[3])
1564 ud = bb.fetch2.FetchData(url, self.d) 1565 url = "http://127.0.0.1:%s/" % port + k[1]
1565 pupver = ud.method.latest_versionstring(ud, self.d) 1566 ud = bb.fetch2.FetchData(url, self.d)
1566 verstring = pupver[0] 1567 pupver = ud.method.latest_versionstring(ud, self.d)
1567 self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0]) 1568 verstring = pupver[0]
1568 r = bb.utils.vercmp_string(v, verstring) 1569 self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0])
1569 self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) 1570 r = bb.utils.vercmp_string(v, verstring)
1571 self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring))
1570 finally: 1572 finally:
1571 server.stop() 1573 server.stop()
1572 1574
1573 @skipIfNoNetwork() 1575 @skipIfNoNetwork()
1574 def test_crate_latest_versionstring(self): 1576 def test_crate_latest_versionstring(self):
1575 for k, v in self.test_crate_uris.items(): 1577 for k, v in self.test_crate_uris.items():
1576 self.d.setVar("PN", k[0]) 1578 with self.subTest(pn=k[0]):
1577 ud = bb.fetch2.FetchData(k[1], self.d) 1579 self.d.setVar("PN", k[0])
1578 pupver = ud.method.latest_versionstring(ud, self.d) 1580 ud = bb.fetch2.FetchData(k[1], self.d)
1579 verstring = pupver[0] 1581 pupver = ud.method.latest_versionstring(ud, self.d)
1580 self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0]) 1582 verstring = pupver[0]
1581 r = bb.utils.vercmp_string(v, verstring) 1583 self.assertTrue(verstring, msg="Could not find upstream version for %s" % k[0])
1582 self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring)) 1584 r = bb.utils.vercmp_string(v, verstring)
1585 self.assertTrue(r == -1 or r == 0, msg="Package %s, version: %s <= %s" % (k[0], v, verstring))
1583 1586
1584class FetchCheckStatusTest(FetcherTest): 1587class FetchCheckStatusTest(FetcherTest):
1585 test_wget_uris = ["https://downloads.yoctoproject.org/releases/sato/sato-engine-0.1.tar.gz", 1588 test_wget_uris = ["https://downloads.yoctoproject.org/releases/sato/sato-engine-0.1.tar.gz",