tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

kunit: tools: fix kunit_tool tests for parsing test plans

Some tests logs for kunit_tool tests are missing their test plans
causing their tests to fail; fix this by adding the test plans.

Fixes: 45dcbb6f5ef7 ("kunit: test: add test plan to KUnit TAP format")
Signed-off-by: Brendan Higgins <brendanhiggins@google.com>
Reviewed-by: David Gow <davidgow@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

authored by

Brendan Higgins and committed by
Shuah Khan 0d0d2451 f0b62039

+31 -7
+25 -7
tools/testing/kunit/kunit_tool_test.py
··· 179 179 print_mock = mock.patch('builtins.print').start() 180 180 result = kunit_parser.parse_run_tests( 181 181 kunit_parser.isolate_kunit_output(file.readlines())) 182 - print_mock.assert_any_call(StrContains("no kunit output detected")) 182 + print_mock.assert_any_call(StrContains('no tests run!')) 183 183 print_mock.stop() 184 184 file.close() 185 185 ··· 198 198 'test_data/test_config_printk_time.log') 199 199 with open(prefix_log) as file: 200 200 result = kunit_parser.parse_run_tests(file.readlines()) 201 - self.assertEqual('kunit-resource-test', result.suites[0].name) 201 + self.assertEqual( 202 + kunit_parser.TestStatus.SUCCESS, 203 + result.status) 204 + self.assertEqual('kunit-resource-test', result.suites[0].name) 202 205 203 206 def test_ignores_multiple_prefixes(self): 204 207 prefix_log = get_absolute_path( 205 208 'test_data/test_multiple_prefixes.log') 206 209 with open(prefix_log) as file: 207 210 result = kunit_parser.parse_run_tests(file.readlines()) 208 - self.assertEqual('kunit-resource-test', result.suites[0].name) 211 + self.assertEqual( 212 + kunit_parser.TestStatus.SUCCESS, 213 + result.status) 214 + self.assertEqual('kunit-resource-test', result.suites[0].name) 209 215 210 216 def test_prefix_mixed_kernel_output(self): 211 217 mixed_prefix_log = get_absolute_path( 212 218 'test_data/test_interrupted_tap_output.log') 213 219 with open(mixed_prefix_log) as file: 214 220 result = kunit_parser.parse_run_tests(file.readlines()) 215 - self.assertEqual('kunit-resource-test', result.suites[0].name) 221 + self.assertEqual( 222 + kunit_parser.TestStatus.SUCCESS, 223 + result.status) 224 + self.assertEqual('kunit-resource-test', result.suites[0].name) 216 225 217 226 def test_prefix_poundsign(self): 218 227 pound_log = get_absolute_path('test_data/test_pound_sign.log') 219 228 with open(pound_log) as file: 220 229 result = kunit_parser.parse_run_tests(file.readlines()) 221 - self.assertEqual('kunit-resource-test', result.suites[0].name) 230 + self.assertEqual( 231 + kunit_parser.TestStatus.SUCCESS, 232 + result.status) 233 + self.assertEqual('kunit-resource-test', result.suites[0].name) 222 234 223 235 def test_kernel_panic_end(self): 224 236 panic_log = get_absolute_path('test_data/test_kernel_panic_interrupt.log') 225 237 with open(panic_log) as file: 226 238 result = kunit_parser.parse_run_tests(file.readlines()) 227 - self.assertEqual('kunit-resource-test', result.suites[0].name) 239 + self.assertEqual( 240 + kunit_parser.TestStatus.TEST_CRASHED, 241 + result.status) 242 + self.assertEqual('kunit-resource-test', result.suites[0].name) 228 243 229 244 def test_pound_no_prefix(self): 230 245 pound_log = get_absolute_path('test_data/test_pound_no_prefix.log') 231 246 with open(pound_log) as file: 232 247 result = kunit_parser.parse_run_tests(file.readlines()) 233 - self.assertEqual('kunit-resource-test', result.suites[0].name) 248 + self.assertEqual( 249 + kunit_parser.TestStatus.SUCCESS, 250 + result.status) 251 + self.assertEqual('kunit-resource-test', result.suites[0].name) 234 252 235 253 class KUnitJsonTest(unittest.TestCase): 236 254
+1
tools/testing/kunit/test_data/test_config_printk_time.log
··· 1 1 [ 0.060000] printk: console [mc-1] enabled 2 2 [ 0.060000] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0 3 3 [ 0.060000] TAP version 14 4 + [ 0.060000] 1..3 4 5 [ 0.060000] # Subtest: kunit-resource-test 5 6 [ 0.060000] 1..5 6 7 [ 0.060000] ok 1 - kunit_resource_test_init_resources
+1
tools/testing/kunit/test_data/test_interrupted_tap_output.log
··· 1 1 [ 0.060000] printk: console [mc-1] enabled 2 2 [ 0.060000] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0 3 3 [ 0.060000] TAP version 14 4 + [ 0.060000] 1..3 4 5 [ 0.060000] # Subtest: kunit-resource-test 5 6 [ 0.060000] 1..5 6 7 [ 0.060000] ok 1 - kunit_resource_test_init_resources
+1
tools/testing/kunit/test_data/test_kernel_panic_interrupt.log
··· 1 1 [ 0.060000] printk: console [mc-1] enabled 2 2 [ 0.060000] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0 3 3 [ 0.060000] TAP version 14 4 + [ 0.060000] 1..3 4 5 [ 0.060000] # Subtest: kunit-resource-test 5 6 [ 0.060000] 1..5 6 7 [ 0.060000] ok 1 - kunit_resource_test_init_resources
+1
tools/testing/kunit/test_data/test_multiple_prefixes.log
··· 1 1 [ 0.060000][ T1] printk: console [mc-1] enabled 2 2 [ 0.060000][ T1] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0 3 3 [ 0.060000][ T1] TAP version 14 4 + [ 0.060000][ T1] 1..3 4 5 [ 0.060000][ T1] # Subtest: kunit-resource-test 5 6 [ 0.060000][ T1] 1..5 6 7 [ 0.060000][ T1] ok 1 - kunit_resource_test_init_resources
+1
tools/testing/kunit/test_data/test_pound_no_prefix.log
··· 1 1 printk: console [mc-1] enabled 2 2 random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0 3 3 TAP version 14 4 + 1..3 4 5 # Subtest: kunit-resource-test 5 6 1..5 6 7 ok 1 - kunit_resource_test_init_resources
+1
tools/testing/kunit/test_data/test_pound_sign.log
··· 1 1 [ 0.060000] printk: console [mc-1] enabled 2 2 [ 0.060000] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0 3 3 [ 0.060000] TAP version 14 4 + [ 0.060000] 1..3 4 5 [ 0.060000] # Subtest: kunit-resource-test 5 6 [ 0.060000] 1..5 6 7 [ 0.060000] ok 1 - kunit_resource_test_init_resources