Merge PR ceph#42431 into master

* refs/pull/42431/head: cmake: add "mypy" back to tox envlist of "qa"" qa/tasks/vstart_runner: add optional "sudo" param to _run_python() Reviewed-by: Sebastian Wagner <[email protected]> Reviewed-by: Patrick Donnelly <[email protected]>
joscollin · Jul 22, 2021 · 4ee6317 · 4ee6317
2 parents e30663a + ffbc316
commit 4ee6317
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/qa/CMakeLists.txt b/qa/CMakeLists.txt
@@ -5,5 +5,5 @@ endif()
 
 if(WITH_TESTS)
   include(AddCephTest)
-  add_tox_test(qa TOX_ENVS py3 flake8)
+  add_tox_test(qa TOX_ENVS py3 flake8 mypy)
 endif()
diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
@@ -659,12 +659,16 @@ def _asok_path(self):
         path = "{0}/client.{1}.*.asok".format(d, self.client_id)
         return path
 
-    def _run_python(self, pyscript, py_version='python'):
+    def _run_python(self, pyscript, py_version='python', sudo=False):
         """
         Override this to remove the daemon-helper prefix that is used otherwise
         to make the process killable.
         """
-        return self.client_remote.run(args=[py_version, '-c', pyscript],
+        args = []
+        if sudo:
+            args.append('sudo')
+        args += [py_version, '-c', pyscript]
+        return self.client_remote.run(args=args,
                                       wait=False, stdout=StringIO())
 
     def setup_netns(self):