replacing assertEquals into assertEqual

[nepi.git] / test / execution / resource.py

diff --git a/test/execution/resource.py b/test/execution/resource.py
index fa3277a..6a4fd8c 100755 (executable)
--- a/test/execution/resource.py
+++ b/test/execution/resource.py
@@ -4,9 +4,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -117,7 +116,7 @@ class Application(ResourceManager):
     def do_start(self):
         super(Application, self).do_start()
         time.sleep(random.random() * 3)
-        self.ec.schedule("0.5s", self.finish)
+        self.ec.schedule("0.5s", self.stop)
 
 class ErrorApplication(ResourceManager):
     _rtype = "ErrorApplication"
@@ -131,7 +130,7 @@ class ErrorApplication(ResourceManager):
             self.ec.schedule("0.5s", self.deploy)
         else:
             time.sleep(random.random() * 2)
-            raise RuntimeError, "NOT A REAL ERROR. JUST TESTING"
+            raise RuntimeError("NOT A REAL ERROR. JUST TESTING")
 
 class ResourceFactoryTestCase(unittest.TestCase):
     def test_add_resource_factory(self):
@@ -141,16 +140,17 @@ class ResourceFactoryTestCase(unittest.TestCase):
         ResourceFactory.register_type(MyResource)
         ResourceFactory.register_type(AnotherResource)
 
-        self.assertEquals(MyResource.get_rtype(), "MyResource")
-        self.assertEquals(len(MyResource._attributes), 2)
+        # Take into account default 'Critical' attribute
+        self.assertEqual(MyResource.get_rtype(), "MyResource")
+        self.assertEqual(len(MyResource._attributes), 3)
 
-        self.assertEquals(ResourceManager.get_rtype(), "Resource")
-        self.assertEquals(len(ResourceManager._attributes), 1)
+        self.assertEqual(ResourceManager.get_rtype(), "Resource")
+        self.assertEqual(len(ResourceManager._attributes), 2)
 
-        self.assertEquals(AnotherResource.get_rtype(), "AnotherResource")
-        self.assertEquals(len(AnotherResource._attributes), 1)
+        self.assertEqual(AnotherResource.get_rtype(), "AnotherResource")
+        self.assertEqual(len(AnotherResource._attributes), 2)
 
-        self.assertEquals(len(ResourceFactory.resource_types()), 2)
+        self.assertEqual(len(ResourceFactory.resource_types()), 2)
         
         # restore factory state for other tests
         from nepi.execution.resource import populate_factory
@@ -175,7 +175,7 @@ class ResourceManagerTestCase(unittest.TestCase):
         for (group, state, time) in conditions:
             waiting_for.extend(group)
 
-        self.assertEquals(waiting_for, [1, 3, 5, 7, 10, 8])
+        self.assertEqual(waiting_for, [1, 3, 5, 7, 10, 8])
 
         group = [1, 2, 3, 4, 6]
         rm.unregister_condition(group)
@@ -185,7 +185,7 @@ class ResourceManagerTestCase(unittest.TestCase):
         for (group, state, time) in conditions:
             waiting_for.extend(group)
 
-        self.assertEquals(waiting_for, [5, 7, 10, 8])
+        self.assertEqual(waiting_for, [5, 7, 10, 8])
 
     def test_deploy_in_order(self):
         """
@@ -269,7 +269,7 @@ class ResourceManagerTestCase(unittest.TestCase):
         node = ec.register_resource("Node")
 
         apps = list()
-        for i in xrange(1000):
+        for i in range(1000):
             app = ec.register_resource("Application")
             ec.register_connection(app, node)
             apps.append(app)
@@ -280,7 +280,7 @@ class ResourceManagerTestCase(unittest.TestCase):
         
         self.assertTrue(ec.state(node) == ResourceState.STARTED)
         self.assertTrue(
-               all([ec.state(guid) == ResourceState.FINISHED \
+               all([ec.state(guid) == ResourceState.STOPPED \
                 for guid in apps])
                 )
 
@@ -306,7 +306,7 @@ class ResourceManagerTestCase(unittest.TestCase):
 
         ec.shutdown()
 
-        self.assertEquals(ec._fm._failure_level, FailureLevel.RM_FAILURE)
+        self.assertEqual(ec._fm._failure_level, FailureLevel.RM_FAILURE)
 
     def test_critical(self):
         from nepi.execution.resource import ResourceFactory
@@ -327,7 +327,7 @@ class ResourceManagerTestCase(unittest.TestCase):
         ec.register_connection(eapp, node)
         apps.append(eapp)
 
-        for i in xrange(10):
+        for i in range(10):
             app = ec.register_resource("Application")
             ec.register_connection(app, node)
             apps.append(app)
@@ -337,17 +337,17 @@ class ResourceManagerTestCase(unittest.TestCase):
         ec.wait_finished(apps)
         
         state = ec.state(eapp)
-        self.assertEquals(state, ResourceState.FAILED)
+        self.assertEqual(state, ResourceState.FAILED)
       
         apps.remove(eapp)
 
         for app in apps:
             state = ec.state(app)
-            self.assertEquals(state, ResourceState.FINISHED)
+            self.assertEqual(state, ResourceState.STOPPED)
         
         ec.shutdown()
 
-        self.assertEquals(ec._fm._failure_level, FailureLevel.OK)
+        self.assertEqual(ec._fm._failure_level, FailureLevel.OK)
 
     def test_start_with_condition(self):
         from nepi.execution.resource import ResourceFactory