From: Kefu Chai <kchai@redhat.com>
Date: Wed, 10 Feb 2021 07:19:12 +0000 (+0800)
Subject: mgr/devicehealth: add devicehealth to flake8 test
X-Git-Tag: v17.1.0~2944^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99805d9cff87f7fe264bbadc235cb8cc311fd460;p=ceph.git

mgr/devicehealth: add devicehealth to flake8 test

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

diff --git a/src/pybind/mgr/devicehealth/__init__.py b/src/pybind/mgr/devicehealth/__init__.py
index 4c5b97ce82b2..ee85dc9d376e 100644
--- a/src/pybind/mgr/devicehealth/__init__.py
+++ b/src/pybind/mgr/devicehealth/__init__.py
@@ -1,2 +1,2 @@
-
+# flake8: noqa
 from .module import Module
diff --git a/src/pybind/mgr/devicehealth/module.py b/src/pybind/mgr/devicehealth/module.py
index 4115f4108219..2c982900b2ff 100644
--- a/src/pybind/mgr/devicehealth/module.py
+++ b/src/pybind/mgr/devicehealth/module.py
@@ -312,7 +312,7 @@ class Module(MgrModule):
             # sleep
             sleep_interval = self.sleep_interval or 60
             self.log.debug('Sleeping for %d seconds', sleep_interval)
-            ret = self.event.wait(sleep_interval)
+            self.event.wait(sleep_interval)
             self.event.clear()
 
     def shutdown(self) -> None:
@@ -659,7 +659,7 @@ class Module(MgrModule):
                 return self.remote(plugin_name, 'predict_life_expectancy', devid=devid)
             else:
                 return -1, '', f'{plugin_name} is not available'
-        except:
+        except Exception:
             return -1, '', 'unable to invoke diskprediction local or remote plugin'
 
     def predict_all_devices(self) -> Tuple[int, str, str]:
@@ -675,7 +675,7 @@ class Module(MgrModule):
                 return self.remote(plugin_name, 'predict_all_devices')
             else:
                 return -1, '', f'{plugin_name} is not available'
-        except:
+        except Exception:
             return -1, '', 'unable to invoke diskprediction local or remote plugin'
 
     def get_recent_device_metrics(self, devid: str, min_sample: str) -> Dict[str, Dict[str, Any]]:
diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index e8dc1cec2ee8..8c14c7df6e92 100644
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -116,6 +116,7 @@ deps =
     flake8
 modules =
     cephadm
+    devicehealth
     orchestrator
 commands =
     flake8 --config=tox.ini {posargs} \