From 304b2e9983206c904e0b3b3dbfeadc605969f332 Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Fri, 25 Jul 2014 11:18:07 +0200 Subject: [PATCH] Small bugfix in ec.py --- src/nepi/execution/ec.py | 2 +- test/execution/resource.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/nepi/execution/ec.py b/src/nepi/execution/ec.py index cf0e0bb7..257742ee 100644 --- a/src/nepi/execution/ec.py +++ b/src/nepi/execution/ec.py @@ -67,7 +67,7 @@ class FailureManager(object): def eval_failure(self, guid): if self._failure_level == FailureLevel.OK: - rm = self.get_resource(guid) + rm = self.ec.get_resource(guid) state = rm.state critical = rm.get("critical") diff --git a/test/execution/resource.py b/test/execution/resource.py index d3cc9115..9b7e5e87 100755 --- a/test/execution/resource.py +++ b/test/execution/resource.py @@ -141,14 +141,15 @@ class ResourceFactoryTestCase(unittest.TestCase): ResourceFactory.register_type(MyResource) ResourceFactory.register_type(AnotherResource) + # Take into account default 'Critical' attribute self.assertEquals(MyResource.get_rtype(), "MyResource") - self.assertEquals(len(MyResource._attributes), 2) + self.assertEquals(len(MyResource._attributes), 3) self.assertEquals(ResourceManager.get_rtype(), "Resource") - self.assertEquals(len(ResourceManager._attributes), 1) + self.assertEquals(len(ResourceManager._attributes), 2) self.assertEquals(AnotherResource.get_rtype(), "AnotherResource") - self.assertEquals(len(AnotherResource._attributes), 1) + self.assertEquals(len(AnotherResource._attributes), 2) self.assertEquals(len(ResourceFactory.resource_types()), 2) -- 2.43.0