with_args and wrap_with cannot take a tuple argument anymore

Signed-off-by: Maciej Grela <[email protected]>

Author: enkiusz

scripts/tests/chiptest/linux.py

@@ -200,7 +200,7 @@ def terminate(self):
             self.run(command)
 
     def wrap_in_namespace(self, subproc: SubprocessInfo):
-        return subproc.wrap_with(("ip", "netns", "exec", "{}-{}".format(subproc.kind, self.index)))
+        return subproc.wrap_with("ip", "netns", "exec", "{}-{}".format(subproc.kind, self.index))
 
 
 class LinuxNamespacedExecutor(Executor):

scripts/tests/chiptest/runner.py

@@ -157,7 +157,7 @@ def __init__(self, executor=None, capture_delegate=None):
     def RunSubprocess(self, subproc: SubprocessInfo, name: str, wait=True, dependencies=[], timeout_seconds: typing.Optional[int] = None, stdin=None):
         if sys.platform == 'darwin':
             # Try harder to avoid any stdout buffering in our tests
-            subproc = subproc.wrap_with(('stdbuf', '-o0', '-i0'))
+            subproc = subproc.wrap_with('stdbuf', '-o0', '-i0')
 
         logging.info('RunSubprocess starting application %s' % subproc)
         cmd = subproc.to_cmd()

scripts/tests/chiptest/test_definition.py

@@ -131,7 +131,7 @@ def wait(self, timeout=None):
                     self.cv_stopped.wait()
 
     def __startServer(self):
-        subproc = self.subproc.with_args('--interface-id', str(-1))
+        subproc = self.subproc.with_args('--interface-id', '-1')
 
         if not self.options:
             logging.debug('Executing application under test with default args')

scripts/tests/run_test_suite.py

@@ -353,7 +353,7 @@ def build_app(arg_value, kind: str, key: str):
     energy_management_app = build_app(energy_management_app, 'app', 'chip-energy-management-app')
     closure_app = build_app(closure_app, 'app', 'closure-app')
     matter_repl_yaml_tester = build_app(matter_repl_yaml_tester, 'tool',
-                                        'yamltest_with_matter_repl_tester.py').wrap_with(('python3',))
+                                        'yamltest_with_matter_repl_tester.py').wrap_with('python3')
 
     if chip_tool_with_python is None:
         if context.obj.runtime == TestRunTime.DARWIN_FRAMEWORK_TOOL_PYTHON:
@@ -362,7 +362,7 @@ def build_app(arg_value, kind: str, key: str):
             chip_tool_with_python = build_app(None, 'tool', 'chiptool.py')
 
         if chip_tool_with_python is not None:
-            chip_tool_with_python = chip_tool_with_python.wrap_with(('python3',))
+            chip_tool_with_python = chip_tool_with_python.wrap_with('python3')
 
     if ble_wifi and sys.platform != "linux":
         raise click.BadOptionUsage("ble-wifi", "Option --ble-wifi is available on Linux platform only")