pybind/mgr/selftest: add selftest to mypy

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/mypy.ini b/src/mypy.ini
index 620d4a9911d37c34b95d664fa7d62884a3d54e84..358ab6dc961014217128bfc185b361017bc6d192 100755 (executable)
--- a/src/mypy.ini
+++ b/src/mypy.ini
@@ -67,6 +67,9 @@ disallow_untyped_defs = True
 [mypy-rook.*]
 disallow_untyped_defs = True
 
+[mypy-selftest.*]
+disallow_untyped_defs = True
+
 # external import
 [mypy-rook.rook_client.*]
 disallow_untyped_defs = False

diff --git a/src/pybind/mgr/selftest/module.py b/src/pybind/mgr/selftest/module.py
index 71b734e5fef43abed0bcd49686fea5d413a02125..7cf44fdcdf5099b0b2f0dd5bae79eafb9e45e5ca 100644 (file)
--- a/src/pybind/mgr/selftest/module.py
+++ b/src/pybind/mgr/selftest/module.py
@@ -5,7 +5,7 @@ import json
 import random
 import sys
 import threading
-from typing import List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 
 # These workloads are things that can be requested to run inside the
@@ -55,11 +55,11 @@ class Module(MgrModule):
                max=42),
     ]
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
         super(Module, self).__init__(*args, **kwargs)
         self._event = threading.Event()
-        self._workload = None
-        self._health = {}
+        self._workload: Optional[Workload] = None
+        self._health: Dict[str, Dict[str, Any]] = {}
 
     @CLICommand('mgr self-test python-version', perm='r')
     def python_version(self) -> Tuple[int, str, str]:
@@ -202,7 +202,7 @@ class Module(MgrModule):
         self.remote("insights", "testing_set_now_time_offset", hours)
         return 0, "", ""
 
-    def _self_test(self):
+    def _self_test(self) -> None:
         self.log.info("Running self-test procedure...")
 
         self._self_test_osdmap()
@@ -212,7 +212,7 @@ class Module(MgrModule):
         self._self_test_misc()
         self._self_test_perf_counters()
 
-    def _self_test_getters(self):
+    def _self_test_getters(self) -> None:
         self.version
         self.get_context()
         self.get_mgr_id()
@@ -258,7 +258,7 @@ class Module(MgrModule):
 
         self.get_daemon_status("osd", "0")
 
-    def _self_test_config(self):
+    def _self_test_config(self) -> None:
         # This is not a strong test (can't tell if values really
         # persisted), it's just for the python interface bit.
 
@@ -349,7 +349,7 @@ class Module(MgrModule):
         assert isinstance(value, bool)
         assert value is True
 
-    def _self_test_store(self):
+    def _self_test_store(self) -> None:
         existing_keys = set(self.get_store_prefix("test").keys())
         self.set_store("testkey", "testvalue")
         assert self.get_store("testkey") == "testvalue"
@@ -357,17 +357,17 @@ class Module(MgrModule):
         assert (set(self.get_store_prefix("test").keys())
                 == {"testkey"} | existing_keys)
 
-    def _self_test_perf_counters(self):
+    def _self_test_perf_counters(self) -> None:
         self.get_perf_schema("osd", "0")
         self.get_counter("osd", "0", "osd.op")
         # get_counter
         # get_all_perf_coutners
 
-    def _self_test_misc(self):
+    def _self_test_misc(self) -> None:
         self.set_uri("http://this.is.a.test.com")
         self.set_health_checks({})
 
-    def _self_test_osdmap(self):
+    def _self_test_osdmap(self) -> None:
         osdmap = self.get_osdmap()
         osdmap.get_epoch()
         osdmap.get_crush_version()
@@ -394,7 +394,7 @@ class Module(MgrModule):
 
         self.log.info("Finished self-test procedure.")
 
-    def _test_remote_calls(self):
+    def _test_remote_calls(self) -> None:
         # Test making valid call
         self.remote("influx", "self_test")
 
@@ -431,21 +431,19 @@ class Module(MgrModule):
         else:
             raise RuntimeError("KeyError not raised")
 
-    def remote_from_orchestrator_cli_self_test(self, what):
+    def remote_from_orchestrator_cli_self_test(self, what: str) -> Any:
         import orchestrator
         if what == 'OrchestratorError':
-            c = orchestrator.OrchResult(result=None, exception=orchestrator.OrchestratorError('hello, world'))
-            return c
+            return orchestrator.OrchResult(result=None, exception=orchestrator.OrchestratorError('hello, world'))
         elif what == "ZeroDivisionError":
-            c = orchestrator.OrchResult(result=None, exception=ZeroDivisionError('hello, world'))
-            return c
+            return orchestrator.OrchResult(result=None, exception=ZeroDivisionError('hello, world'))
         assert False, repr(what)
 
-    def shutdown(self):
+    def shutdown(self) -> None:
         self._workload = Workload.SHUTDOWN
         self._event.set()
 
-    def _command_spam(self):
+    def _command_spam(self) -> None:
         self.log.info("Starting command_spam workload...")
         while not self._event.is_set():
             osdmap = self.get_osdmap()
@@ -466,7 +464,7 @@ class Module(MgrModule):
         self._event.clear()
         self.log.info("Ended command_spam workload...")
 
-    def serve(self):
+    def serve(self) -> None:
         while True:
             if self._workload == Workload.COMMAND_SPAM:
                 self._command_spam()

diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index d937a353fe27fc4962f0be534ea3bf043dcf650f..b60fbaa87fae276dcf5f5b6b389689d3450543a4 100644 (file)
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -82,6 +82,7 @@ commands =
            -m rbd_support \
            -m rook \
            -m snap_schedule \
+           -m selftest \
            -m stats \
            -m status \
            -m telegraf \