lkml.org 
[lkml]   [2020]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.8 63/72] kunit: tool: fix broken default args in unit tests
    Date
    From: Brendan Higgins <brendanhiggins@google.com>

    [ Upstream commit 6816fe61bda8c819c368ad2002cd27172ecb79de ]

    Commit ddbd60c779b4 ("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: ddbd60c779b4 ("kunit: use --build_dir=.kunit as default")
    Signed-off-by: Brendan Higgins <brendanhiggins@google.com>
    Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/kunit/kunit_tool_test.py | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py
    index f9eeaea94cad1..ee942d80bdd02 100755
    --- a/tools/testing/kunit/kunit_tool_test.py
    +++ b/tools/testing/kunit/kunit_tool_test.py
    @@ -258,14 +258,14 @@ class KUnitMainTest(unittest.TestCase):
    def test_build_passes_args_pass(self):
    kunit.main(['build'], self.linux_source_mock)
    assert self.linux_source_mock.build_reconfig.call_count == 0
    - self.linux_source_mock.build_um_kernel.assert_called_once_with(False, 8, '', None)
    + self.linux_source_mock.build_um_kernel.assert_called_once_with(False, 8, '.kunit', None)
    assert self.linux_source_mock.run_kernel.call_count == 0

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

    def test_run_passes_args_pass(self):
    @@ -273,7 +273,7 @@ class KUnitMainTest(unittest.TestCase):
    assert self.linux_source_mock.build_reconfig.call_count == 1
    assert self.linux_source_mock.run_kernel.call_count == 1
    self.linux_source_mock.run_kernel.assert_called_once_with(
    - build_dir='', timeout=300)
    + build_dir='.kunit', timeout=300)
    self.print_mock.assert_any_call(StrContains('Testing complete.'))

    def test_exec_passes_args_fail(self):
    @@ -313,7 +313,7 @@ class KUnitMainTest(unittest.TestCase):
    def test_exec_timeout(self):
    timeout = 3453
    kunit.main(['exec', '--timeout', str(timeout)], self.linux_source_mock)
    - self.linux_source_mock.run_kernel.assert_called_once_with(build_dir='', timeout=timeout)
    + self.linux_source_mock.run_kernel.assert_called_once_with(build_dir='.kunit', timeout=timeout)
    self.print_mock.assert_any_call(StrContains('Testing complete.'))

    def test_run_timeout(self):
    @@ -321,7 +321,7 @@ class KUnitMainTest(unittest.TestCase):
    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(
    - build_dir='', timeout=timeout)
    + build_dir='.kunit', timeout=timeout)
    self.print_mock.assert_any_call(StrContains('Testing complete.'))

    def test_run_builddir(self):
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-08-09 01:49    [W:4.027 / U:0.580 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site