Move LinuxNamespacedExecutor to linux.py

Author: XToripuru

scripts/tests/chiptest/linux.py

@@ -29,7 +29,7 @@
 
 import sdbus
 
-from .runner import SubprocessInfo
+from .runner import Executor, SubprocessInfo
 
 test_environ = os.environ.copy()
 
@@ -202,6 +202,14 @@ def terminate(self):
     def wrap_in_namespace(self, subproc: SubprocessInfo):
         return subproc.wrap_with(("ip", "netns", "exec", "{}-{}".format(subproc.kind, self.index)))
 
+class LinuxNamespacedExecutor(Executor):
+    def __init__(self, ns):
+        self.ns = ns
+
+    def run(self, subproc: SubprocessInfo, stdin, stdout, stderr):
+        wrapped = self.ns.wrap_in_namespace(subproc)
+        s = subprocess.Popen(wrapped.to_cmd(), stdin=stdin, stdout=stdout, stderr=stderr)
+        return s
 
 class DBusTestSystemBus(subprocess.Popen):
     """Run a dbus-daemon in a subprocess as a test system bus."""

scripts/tests/chiptest/runner.py

@@ -149,16 +149,6 @@ def run(self, subproc: SubprocessInfo, stdin, stdout, stderr):
         return s
 
 
-class LinuxNamespacedExecutor(Executor):
-    def __init__(self, ns):
-        self.ns = ns
-
-    def run(self, subproc: SubprocessInfo, stdin, stdout, stderr):
-        wrapped = self.ns.wrap_in_namespace(subproc)
-        s = subprocess.Popen(wrapped.to_cmd(), stdin=stdin, stdout=stdout, stderr=stderr)
-        return s
-
-
 class Runner:
     def __init__(self, executor=None, capture_delegate=None):
         self.executor = Executor() if executor is None else executor

scripts/tests/run_test_suite.py

@@ -409,7 +409,7 @@ def build_app(arg_value, kind: str, key: str):
             ble_controller_app = 0   # Bind app to the first BLE controller
             ble_controller_tool = 1  # Bind tool to the second BLE controller
 
-        executor = chiptest.runner.LinuxNamespacedExecutor(ns)
+        executor = chiptest.linux.LinuxNamespacedExecutor(ns)
         runner = runner = chiptest.runner.Runner(executor=executor)
     else:
         runner = chiptest.runner.Runner()