Commit 9660209d authored by Daniel Latypov's avatar Daniel Latypov Committed by Shuah Khan
Browse files

kunit: tool: print clearer error message when there's no TAP output 



Before:
$ ./tools/testing/kunit/kunit.py parse /dev/null
...
[ERROR] Test : invalid KTAP input!

After:
$ ./tools/testing/kunit/kunit.py parse /dev/null
...
[ERROR] Test <missing>: could not find any KTAP output!

This error message gets printed out when extract_tap_output() yielded no
lines. So while it could be because of malformed KTAP output from KUnit,
it could also be due to not having any KTAP output at all.

Try and make the error message here more clear.

Signed-off-by: default avatarDaniel Latypov <dlatypov@google.com>
Reviewed-by: default avatarDavid Gow <davidgow@google.com>
Reviewed-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 3f0a50f3

tools/testing/kunit/kunit_parser.py

+2 −1
Original line number Diff line number Diff line
@@ -824,7 +824,8 @@ def parse_run_tests(kernel_output: Iterable[str]) -> Test: 
	lines = extract_tap_lines(kernel_output)

	test = Test()

	if not lines:

		test.add_error('invalid KTAP input!')

		test.name = '<missing>'

		test.add_error('could not find any KTAP output!')

		test.status = TestStatus.FAILURE_TO_PARSE_TESTS

	else:

		test = parse_test(lines, 0, [])

tools/testing/kunit/kunit_tool_test.py

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ class KUnitParserTest(unittest.TestCase): 
		with open(crash_log) as file:

			result = kunit_parser.parse_run_tests(

				kunit_parser.extract_tap_lines(file.readlines()))

		print_mock.assert_any_call(StrContains('invalid KTAP input!'))

		print_mock.assert_any_call(StrContains('could not find any KTAP output!'))

		print_mock.stop()

		self.assertEqual(0, len(result.subtests))
@@ -557,7 +557,7 @@ class KUnitMainTest(unittest.TestCase): 
		self.assertEqual(e.exception.code, 1)

		self.assertEqual(self.linux_source_mock.build_reconfig.call_count, 1)

		self.assertEqual(self.linux_source_mock.run_kernel.call_count, 1)

		self.print_mock.assert_any_call(StrContains('invalid KTAP input!'))

		self.print_mock.assert_any_call(StrContains('could not find any KTAP output!'))



	def test_exec_no_tests(self):

		self.linux_source_mock.run_kernel = mock.Mock(return_value=['TAP version 14', '1..0'])