From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Fri, 25 Jul 2014 09:18:07 +0000 (+0200)
Subject: Small bugfix in ec.py
X-Git-Tag: nepi-3.2.0~118^2~1
X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=304b2e9983206c904e0b3b3dbfeadc605969f332

Small bugfix in ec.py
---

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)