2019-12-02 23:55:30

by Heidi Fahim

[permalink] [raw]
Subject: [PATCH v2] kunit: testing kunit: Bug fix in test_run_timeout function

Assert in test_run_timeout was not updated with the build_dir argument
and caused the following error:
AssertionError: Expected call: run_kernel(timeout=3453)
Actual call: run_kernel(build_dir=None, timeout=3453)

Needed to update kunit_tool_test to reflect this fix
https://lkml.org/lkml/2019/9/6/351

Signed-off-by: Heidi Fahim <[email protected]>
Reviewed-by: SeongJae Park <[email protected]>
---
tools/testing/kunit/kunit_tool_test.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py
index 4a12baa0cd4e..a2a8ea6beae3 100755
--- a/tools/testing/kunit/kunit_tool_test.py
+++ b/tools/testing/kunit/kunit_tool_test.py
@@ -199,7 +199,7 @@ class KUnitMainTest(unittest.TestCase):
timeout = 3453
kunit.main(['run', '--timeout', str(timeout)], self.linux_source_mock)
assert self.linux_source_mock.build_reconfig.call_count == 1
- self.linux_source_mock.run_kernel.assert_called_once_with(timeout=timeout)
+ self.linux_source_mock.run_kernel.assert_called_once_with(build_dir=None, timeout=timeout)
self.print_mock.assert_any_call(StrContains('Testing complete.'))

if __name__ == '__main__':
--
2.24.0.393.g34dc348eaf-goog


2019-12-03 06:18:12

by Brendan Higgins

[permalink] [raw]
Subject: Re: [PATCH v2] kunit: testing kunit: Bug fix in test_run_timeout function

On Mon, Dec 2, 2019 at 3:53 PM Heidi Fahim <[email protected]> wrote:
>
> Assert in test_run_timeout was not updated with the build_dir argument
> and caused the following error:
> AssertionError: Expected call: run_kernel(timeout=3453)
> Actual call: run_kernel(build_dir=None, timeout=3453)
>
> Needed to update kunit_tool_test to reflect this fix
> https://lkml.org/lkml/2019/9/6/351
>
> Signed-off-by: Heidi Fahim <[email protected]>
> Reviewed-by: SeongJae Park <[email protected]>

Reviewed-by: Brendan Higgins <[email protected]>
Tested-by: Brendan Higgins <[email protected]>

Heidi, thanks for taking care of this!

Shuah, can we make sure to get this in as a v5.5 fix?