From f6efbf3e21b3c16a5d4fa1353f234f7b658cb4f5 Mon Sep 17 00:00:00 2001 From: Dirk Sammel Date: Thu, 9 Mar 2023 13:44:30 +0100 Subject: [PATCH 1/2] fix problem with components in auditor plugin --- tardis/plugins/auditor.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tardis/plugins/auditor.py b/tardis/plugins/auditor.py index 2ec56aa2..b2d120e4 100644 --- a/tardis/plugins/auditor.py +++ b/tardis/plugins/auditor.py @@ -41,9 +41,12 @@ def __init__(self): self._resources[site.name][machine_type][resource] = getattr( config, site.name ).MachineMetaData[machine_type][resource] - self._components[site.name][machine_type][resource] = getattr( - config_auditor.components, machine_type - ).get(resource, {}) + try: + self._components[site.name][machine_type][resource] = getattr( + config_auditor.components, machine_type + ).get(resource, {}) + except AttributeError: + continue self._user = getattr(config_auditor, "user", "tardis") self._group = getattr(config_auditor, "group", "tardis") From bec74108e51f32f3862b0ed02791a309625e6fef Mon Sep 17 00:00:00 2001 From: Dirk Sammel Date: Thu, 9 Mar 2023 14:08:18 +0100 Subject: [PATCH 2/2] added test --- tests/plugins_t/test_auditor.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/plugins_t/test_auditor.py b/tests/plugins_t/test_auditor.py index 0307d35e..b1c7ce5a 100644 --- a/tests/plugins_t/test_auditor.py +++ b/tests/plugins_t/test_auditor.py @@ -163,3 +163,8 @@ def test_construct_record(self): self.assertEqual(len(record.components[1].scores), 1) self.assertEqual(record.components[1].scores[0].name, "BLUBB") self.assertEqual(record.components[1].scores[0].value, 1.4) + + def test_missing_components(self): + del self.config.Plugins.Auditor.components + plugin = Auditor() + self.assertEqual(plugin._components, {"testsite": {"test_machine_type": {}}})