patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

twister: Make --list-tests respect tag filter

Browse source 
Make the --list-tests and --tests-tree options outputs
respect the --tag and --exclude-tag options,
so that only the tests for the specified tags are listed.

Also update the TestPlan report testcases for this change.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
This commit is contained in:
Declan Snyder 2024-04-17 17:10:37 -05:00 committed by Alberto Escolar
parent c1b07eda84
commit 5edc356d96
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
scripts/pylib/twister/twisterlib/testplan.py
View file

@ -349,13 +349,13 @@ class TestPlan:
print("- {}".format(t)) print("- {}".format(t))
def report_test_tree(self): def report_test_tree(self):
all_tests = self.get_all_tests() tests_list = self.get_tests_list()
testsuite = Node("Testsuite") testsuite = Node("Testsuite")
samples = Node("Samples", parent=testsuite) samples = Node("Samples", parent=testsuite)
tests = Node("Tests", parent=testsuite) tests = Node("Tests", parent=testsuite)
for test in sorted(all_tests): for test in sorted(tests_list):
if test.startswith("sample."): if test.startswith("sample."):
sec = test.split(".") sec = test.split(".")
area = find(samples, lambda node: node.name == sec[1] and node.parent == samples) area = find(samples, lambda node: node.name == sec[1] and node.parent == samples)
@ -379,13 +379,12 @@ class TestPlan:
print("%s%s" % (pre, node.name)) print("%s%s" % (pre, node.name))
def report_test_list(self): def report_test_list(self):
cnt = 0 tests_list = self.get_tests_list()
all_tests = self.get_all_tests()
for test in sorted(all_tests): cnt = 0
for test in sorted(tests_list):
cnt = cnt + 1 cnt = cnt + 1
print(" - {}".format(test)) print(" - {}".format(test))
print("{} total.".format(cnt)) print("{} total.".format(cnt))
def config(self): def config(self):
@ -481,6 +480,26 @@ class TestPlan:
return testcases return testcases
def get_tests_list(self):
testcases = []
if tag_filter := self.options.tag:
for _, ts in self.testsuites.items():
if ts.tags.intersection(tag_filter):
for case in ts.testcases:
testcases.append(case.name)
else:
for _, ts in self.testsuites.items():
for case in ts.testcases:
testcases.append(case.name)
if exclude_tag := self.options.exclude_tag:
for _, ts in self.testsuites.items():
if ts.tags.intersection(exclude_tag):
for case in ts.testcases:
if case.name in testcases:
testcases.remove(case.name)
return testcases
def add_testsuites(self, testsuite_filter=[]): def add_testsuites(self, testsuite_filter=[]):
for root in self.env.test_roots: for root in self.env.test_roots:
root = os.path.abspath(root) root = os.path.abspath(root)

4
scripts/tests/twister/test_testplan.py
View file

@ -973,7 +973,7 @@ def test_testplan_report_tag_list(capfd):
def test_testplan_report_test_tree(capfd): def test_testplan_report_test_tree(capfd):
testplan = TestPlan(env=mock.Mock()) testplan = TestPlan(env=mock.Mock())
testplan.get_all_tests = mock.Mock( testplan.get_tests_list = mock.Mock(
return_value=['1.dummy.case.1', '1.dummy.case.2', return_value=['1.dummy.case.1', '1.dummy.case.2',
'2.dummy.case.1', '2.dummy.case.2', '2.dummy.case.1', '2.dummy.case.2',
'3.dummy.case.1', '3.dummy.case.2', '3.dummy.case.1', '3.dummy.case.2',
@ -1031,7 +1031,7 @@ Testsuite
def test_testplan_report_test_list(capfd): def test_testplan_report_test_list(capfd):
testplan = TestPlan(env=mock.Mock()) testplan = TestPlan(env=mock.Mock())
testplan.get_all_tests = mock.Mock( testplan.get_tests_list = mock.Mock(
return_value=['4.dummy.case.1', '4.dummy.case.2', return_value=['4.dummy.case.1', '4.dummy.case.2',
'3.dummy.case.2', '2.dummy.case.2', '3.dummy.case.2', '2.dummy.case.2',
'1.dummy.case.1', '1.dummy.case.2', '1.dummy.case.1', '1.dummy.case.2',