Merge ~vultaire/charm-hw-health:class-object-mismatch-patch into charm-hw-health:master

[Paul Goins]

[Drew Freiberger (afreiberger)]

+1 on this method.

review: Approve

diff --git a/src/lib/hwhealth/hwdiscovery.py b/src/lib/hwhealth/hwdiscovery.py
index fe27403..5b0475e 100644
--- a/src/lib/hwhealth/hwdiscovery.py
+++ b/src/lib/hwhealth/hwdiscovery.py
@@ -84,8 +84,8 @@ def _get_tools():
             "System vendor not supported: {}".format(system_vendor), hookenv.DEBUG
         )
 
-    executed_toolset = set([tool() for tool in toolset if tool.is_series_supported])
-    return executed_toolset
+    toolset = set(tool for tool in toolset if tool.is_series_supported)
+    return toolset
 
 
 def _supports_mdadm():
diff --git a/src/tests/unit/test_hwdiscovery.py b/src/tests/unit/test_hwdiscovery.py
index e3d660c..1694e76 100644
--- a/src/tests/unit/test_hwdiscovery.py
+++ b/src/tests/unit/test_hwdiscovery.py
@@ -67,8 +67,7 @@ class TestGetTools(unittest.TestCase):
             mock_hw.return_value = Hardware(filename=sample)
             basename = os.path.basename(sample)
             with self.subTest(msg="Subtest {}".format(basename)):
-                actual_instances = hwhealth.hwdiscovery.get_tools()
-                actual_classes = {tool.__class__ for tool in actual_instances}
+                actual_classes = hwhealth.hwdiscovery.get_tools()
                 expected = self.EXPECTED_TOOLS.get(basename)
                 self.assertEqual(actual_classes, expected)