Re: [PATCH 1/3] kunit: tool: drop unused load_config argument

On Tue, May 17, 2022 at 3:48 AM Daniel Latypov dlatypov@google.com wrote:

It's always set to true except in one test case. And in that test case it can safely be set to true anyways.

Signed-off-by: Daniel Latypov dlatypov@google.com

Looks good.

Reviewed-by: David Gow davidgow@google.com

-- David

tools/testing/kunit/kunit_kernel.py | 4 ---- tools/testing/kunit/kunit_tool_test.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py index 3539efaf99ba..8bc8305ba817 100644 --- a/tools/testing/kunit/kunit_kernel.py +++ b/tools/testing/kunit/kunit_kernel.py @@ -219,7 +219,6 @@ class LinuxSourceTree: def __init__( self, build_dir: str,

•         load_config=True,
          kunitconfig_path='',
          kconfig_add: Optional[List[str]]=None,
          arch=None,
  

@@ -233,9 +232,6 @@ class LinuxSourceTree: self._arch = 'um' if arch is None else arch self._ops = get_source_tree_ops(self._arch, cross_compile)

•           if not load_config:
  

•                   return
  

•           if kunitconfig_path:
                    if os.path.isdir(kunitconfig_path):
                            kunitconfig_path = os.path.join(kunitconfig_path, KUNITCONFIG_PATH)
  

diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py index 25a2eb3bf114..b9158017ece6 100755 --- a/tools/testing/kunit/kunit_tool_test.py +++ b/tools/testing/kunit/kunit_tool_test.py @@ -393,7 +393,7 @@ class LinuxSourceTreeTest(unittest.TestCase): return subprocess.Popen(['echo "hi\nbye"'], shell=True, text=True, stdout=subprocess.PIPE)

            with tempfile.TemporaryDirectory('') as build_dir:

•                   tree = kunit_kernel.LinuxSourceTree(build_dir, load_config=False)
  

•                   tree = kunit_kernel.LinuxSourceTree(build_dir)
                    mock.patch.object(tree._ops, 'start', side_effect=fake_start).start()
  
                    with self.assertRaises(ValueError):
  
  

base-commit: 8a7ccad38f8b25c8202efd69371a022357286400

2.36.1.124.g0e6072fb45-goog