Cleanup code

Author: jlatusek

scripts/tests/chiptest/linux.py

@@ -277,8 +277,7 @@ def _set_interface_ip_in_netns(netns: str, dev: str, ip: str):
     def start(self):
         hostapd_cmd = ["ip", "netns", "exec", "tool", self._hostapd_path, self._hostapd_conf]
         dnsmaq_cmd = ["ip", "netns", "exec", "tool", self._dnsmasq_path, "-d", "-C", self._dnsmasq_conf]
-        # TODO: change wlan0 to the actual interface name
-        dhclient_cmd = ["ip", "netns", "exec", "app", "dhclient", "wlan0"]
+        dhclient_cmd = ["ip", "netns", "exec", "app", "dhclient", self._wlan_app]
         wpa_cmd = [
             "ip",
             "netns",

scripts/tests/chiptest/test_definition.py

@@ -389,8 +389,8 @@ def Run(self, runner, apps_register, paths: ApplicationPaths, pics_file: str,
                         "--ble-adapter", str(tool_hci_number)]
                 else:
                     pairing_cmd = paths.chip_tool_with_python_cmd + ['pairing', 'code', TEST_NODE_ID, setupCode]
-                    if self.target == TestTarget.LIT_ICD and test_runtime == TestRunTime.CHIP_TOOL_PYTHON:
-                        pairing_cmd += ['--icd-registration', 'true']
+                if self.target == TestTarget.LIT_ICD and test_runtime == TestRunTime.CHIP_TOOL_PYTHON:
+                    pairing_cmd += ['--icd-registration', 'true']
                 test_cmd = paths.chip_tool_with_python_cmd + ['tests', self.run_name] + ['--PICS', pics_file]
                 server_args = ['--server_path', paths.chip_tool[-1]] + \
                     ['--server_arguments', 'interactive server' +
@@ -412,7 +412,6 @@ def quoter(arg): return f"'{arg}'" if ' ' in arg else arg
                         test_cmd,
                         name='TEST', dependencies=[apps_register],
                         timeout_seconds=timeout_seconds)
-            runner.capture_delegate.LogContents()
 
         except Exception:
             logging.error("!!!!!!!!!!!!!!!!!!!! ERROR !!!!!!!!!!!!!!!!!!!!!!")