Skip to content

Commit 6816fe6

Browse files
bjh83shuahkh
authored andcommitted
kunit: tool: fix broken default args in unit tests
Commit ddbd60c ("kunit: use --build_dir=.kunit as default") changed the default build directory for KUnit tests, but failed to update associated unit tests for kunit_tool, so update them. Fixes: ddbd60c ("kunit: use --build_dir=.kunit as default") Signed-off-by: Brendan Higgins <[email protected]> Signed-off-by: Shuah Khan <[email protected]>
1 parent 5a9fcad commit 6816fe6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tools/testing/kunit/kunit_tool_test.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,22 +247,22 @@ def test_config_passes_args_pass(self):
247247
def test_build_passes_args_pass(self):
248248
kunit.main(['build'], self.linux_source_mock)
249249
assert self.linux_source_mock.build_reconfig.call_count == 0
250-
self.linux_source_mock.build_um_kernel.assert_called_once_with(False, 8, '', None)
250+
self.linux_source_mock.build_um_kernel.assert_called_once_with(False, 8, '.kunit', None)
251251
assert self.linux_source_mock.run_kernel.call_count == 0
252252

253253
def test_exec_passes_args_pass(self):
254254
kunit.main(['exec'], self.linux_source_mock)
255255
assert self.linux_source_mock.build_reconfig.call_count == 0
256256
assert self.linux_source_mock.run_kernel.call_count == 1
257-
self.linux_source_mock.run_kernel.assert_called_once_with(build_dir='', timeout=300)
257+
self.linux_source_mock.run_kernel.assert_called_once_with(build_dir='.kunit', timeout=300)
258258
self.print_mock.assert_any_call(StrContains('Testing complete.'))
259259

260260
def test_run_passes_args_pass(self):
261261
kunit.main(['run'], self.linux_source_mock)
262262
assert self.linux_source_mock.build_reconfig.call_count == 1
263263
assert self.linux_source_mock.run_kernel.call_count == 1
264264
self.linux_source_mock.run_kernel.assert_called_once_with(
265-
build_dir='', timeout=300)
265+
build_dir='.kunit', timeout=300)
266266
self.print_mock.assert_any_call(StrContains('Testing complete.'))
267267

268268
def test_exec_passes_args_fail(self):
@@ -302,15 +302,15 @@ def test_run_raw_output(self):
302302
def test_exec_timeout(self):
303303
timeout = 3453
304304
kunit.main(['exec', '--timeout', str(timeout)], self.linux_source_mock)
305-
self.linux_source_mock.run_kernel.assert_called_once_with(build_dir='', timeout=timeout)
305+
self.linux_source_mock.run_kernel.assert_called_once_with(build_dir='.kunit', timeout=timeout)
306306
self.print_mock.assert_any_call(StrContains('Testing complete.'))
307307

308308
def test_run_timeout(self):
309309
timeout = 3453
310310
kunit.main(['run', '--timeout', str(timeout)], self.linux_source_mock)
311311
assert self.linux_source_mock.build_reconfig.call_count == 1
312312
self.linux_source_mock.run_kernel.assert_called_once_with(
313-
build_dir='', timeout=timeout)
313+
build_dir='.kunit', timeout=timeout)
314314
self.print_mock.assert_any_call(StrContains('Testing complete.'))
315315

316316
def test_run_builddir(self):

0 commit comments

Comments
 (0)