Skip to content

Commit 0d0d245

Browse files
bjh83shuahkh
bjh83
authored and
shuahkh
committed
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: 45dcbb6 ("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>
1 parent f0b6203 commit 0d0d245

7 files changed

Lines changed: 36 additions & 12 deletions

‎tools/testing/kunit/kunit_tool_test.py‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def test_no_kunit_output(self):
179179
print_mock = mock.patch('builtins.print').start()
180180
result = kunit_parser.parse_run_tests(
181181
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!'))
183183
print_mock.stop()
184184
file.close()
185185

@@ -198,39 +198,57 @@ def test_ignores_prefix_printk_time(self):
198198
'test_data/test_config_printk_time.log')
199199
with open(prefix_log) as file:
200200
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)
202205

203206
def test_ignores_multiple_prefixes(self):
204207
prefix_log = get_absolute_path(
205208
'test_data/test_multiple_prefixes.log')
206209
with open(prefix_log) as file:
207210
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)
209215

210216
def test_prefix_mixed_kernel_output(self):
211217
mixed_prefix_log = get_absolute_path(
212218
'test_data/test_interrupted_tap_output.log')
213219
with open(mixed_prefix_log) as file:
214220
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)
216225

217226
def test_prefix_poundsign(self):
218227
pound_log = get_absolute_path('test_data/test_pound_sign.log')
219228
with open(pound_log) as file:
220229
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)
222234

223235
def test_kernel_panic_end(self):
224236
panic_log = get_absolute_path('test_data/test_kernel_panic_interrupt.log')
225237
with open(panic_log) as file:
226238
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)
228243

229244
def test_pound_no_prefix(self):
230245
pound_log = get_absolute_path('test_data/test_pound_no_prefix.log')
231246
with open(pound_log) as file:
232247
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)
234252

235253
class KUnitJsonTest(unittest.TestCase):
236254

‎tools/testing/kunit/test_data/test_config_printk_time.log‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[ 0.060000] printk: console [mc-1] enabled
22
[ 0.060000] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0
33
[ 0.060000] TAP version 14
4+
[ 0.060000] 1..3
45
[ 0.060000] # Subtest: kunit-resource-test
56
[ 0.060000] 1..5
67
[ 0.060000] ok 1 - kunit_resource_test_init_resources
@@ -28,4 +29,4 @@
2829
[ 0.060000] Stack:
2930
[ 0.060000] 602086f8 601bc260 705c0000 705c0000
3031
[ 0.060000] 602086f8 6005fcec 705c0000 6002c6ab
31-
[ 0.060000] 6005fcec 601bc260 705c0000 3000000010
32+
[ 0.060000] 6005fcec 601bc260 705c0000 3000000010

‎tools/testing/kunit/test_data/test_interrupted_tap_output.log‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[ 0.060000] printk: console [mc-1] enabled
22
[ 0.060000] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0
33
[ 0.060000] TAP version 14
4+
[ 0.060000] 1..3
45
[ 0.060000] # Subtest: kunit-resource-test
56
[ 0.060000] 1..5
67
[ 0.060000] ok 1 - kunit_resource_test_init_resources
@@ -34,4 +35,4 @@
3435
[ 0.060000] Stack:
3536
[ 0.060000] 602086f8 601bc260 705c0000 705c0000
3637
[ 0.060000] 602086f8 6005fcec 705c0000 6002c6ab
37-
[ 0.060000] 6005fcec 601bc260 705c0000 3000000010
38+
[ 0.060000] 6005fcec 601bc260 705c0000 3000000010

‎tools/testing/kunit/test_data/test_kernel_panic_interrupt.log‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[ 0.060000] printk: console [mc-1] enabled
22
[ 0.060000] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0
33
[ 0.060000] TAP version 14
4+
[ 0.060000] 1..3
45
[ 0.060000] # Subtest: kunit-resource-test
56
[ 0.060000] 1..5
67
[ 0.060000] ok 1 - kunit_resource_test_init_resources
@@ -22,4 +23,4 @@
2223
[ 0.060000] Stack:
2324
[ 0.060000] 602086f8 601bc260 705c0000 705c0000
2425
[ 0.060000] 602086f8 6005fcec 705c0000 6002c6ab
25-
[ 0.060000] 6005fcec 601bc260 705c0000 3000000010
26+
[ 0.060000] 6005fcec 601bc260 705c0000 3000000010

‎tools/testing/kunit/test_data/test_multiple_prefixes.log‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[ 0.060000][ T1] printk: console [mc-1] enabled
22
[ 0.060000][ T1] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0
33
[ 0.060000][ T1] TAP version 14
4+
[ 0.060000][ T1] 1..3
45
[ 0.060000][ T1] # Subtest: kunit-resource-test
56
[ 0.060000][ T1] 1..5
67
[ 0.060000][ T1] ok 1 - kunit_resource_test_init_resources
@@ -28,4 +29,4 @@
2829
[ 0.060000][ T1] Stack:
2930
[ 0.060000][ T1] 602086f8 601bc260 705c0000 705c0000
3031
[ 0.060000][ T1] 602086f8 6005fcec 705c0000 6002c6ab
31-
[ 0.060000][ T1] 6005fcec 601bc260 705c0000 3000000010
32+
[ 0.060000][ T1] 6005fcec 601bc260 705c0000 3000000010

‎tools/testing/kunit/test_data/test_pound_no_prefix.log‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
printk: console [mc-1] enabled
22
random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0
33
TAP version 14
4+
1..3
45
# Subtest: kunit-resource-test
56
1..5
67
ok 1 - kunit_resource_test_init_resources
@@ -30,4 +31,4 @@
3031
Stack:
3132
602086f8 601bc260 705c0000 705c0000
3233
602086f8 6005fcec 705c0000 6002c6ab
33-
6005fcec 601bc260 705c0000 3000000010
34+
6005fcec 601bc260 705c0000 3000000010

‎tools/testing/kunit/test_data/test_pound_sign.log‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[ 0.060000] printk: console [mc-1] enabled
22
[ 0.060000] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0
33
[ 0.060000] TAP version 14
4+
[ 0.060000] 1..3
45
[ 0.060000] # Subtest: kunit-resource-test
56
[ 0.060000] 1..5
67
[ 0.060000] ok 1 - kunit_resource_test_init_resources

0 commit comments

Comments
 (0)