Small bugfix in ec.py
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Fri, 25 Jul 2014 09:18:07 +0000 (11:18 +0200)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Fri, 25 Jul 2014 09:18:07 +0000 (11:18 +0200)
src/nepi/execution/ec.py
test/execution/resource.py

index cf0e0bb..257742e 100644 (file)
@@ -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")
 
index d3cc911..9b7e5e8 100755 (executable)
@@ -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)