replacing assertEquals into assertEqual

[nepi.git] / test / resources / omf / omf5_vlc_wrong_non_critical.py

diff --git a/test/resources/omf/omf5_vlc_wrong_non_critical.py b/test/resources/omf/omf5_vlc_wrong_non_critical.py
index be61906..34209b2 100755 (executable)
--- a/test/resources/omf/omf5_vlc_wrong_non_critical.py
+++ b/test/resources/omf/omf5_vlc_wrong_non_critical.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
@@ -97,17 +96,17 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase):
 
         self.ec.wait_finished([self.app1])
 
-        self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.FAILED)
-        self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.FAILED)
 
         self.ec.shutdown()
 
-        self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
 
     def test_deploy_with_node_and_iface_nc(self):
         self.node2 = self.ec.register_resource("omf::Node")
@@ -141,17 +140,17 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase):
 
         self.ec.wait_finished([self.app1])
 
-        self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.FAILED)
-        self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.FAILED)
 
         self.ec.shutdown()
 
-        self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
 
     def test_deploy_with_node_iface_channel_nc(self):
         self.node2 = self.ec.register_resource("omf::Node")
@@ -183,18 +182,18 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase):
 
         self.ec.wait_finished([self.app1])
 
-        self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.FAILED)
-        self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.FAILED)
-        self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.FAILED)
 
         self.ec.shutdown()
 
-        self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
 
     def test_deploy_with_app_nc(self):
         self.node2 = self.ec.register_resource("omf::Node")
@@ -238,18 +237,18 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase):
 
         self.ec.wait_finished([self.app1, self.app2])
 
-        self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.STOPPED)
-        self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.STOPPED)
+        self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.FAILED)
 
         self.ec.shutdown()
 
-        self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.RELEASED)
 
     def test_deploy_with_all_nc_and_app_critical(self):
         self.node2 = self.ec.register_resource("omf::Node")
@@ -282,17 +281,17 @@ class OMFVLCWrongCaseWithNonCritical(unittest.TestCase):
 
         self.ec.wait_finished([self.app1, self.app2])
 
-        self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.FAILED)
 
         self.ec.shutdown()
 
-        self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.RELEASED)
 
 
 class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase):
@@ -376,19 +375,19 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase):
 
         self.ec.wait_finished([self.app1, self.app2, self.app3])
 
-        self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.FAILED)
-        self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.FAILED)
 
         self.ec.shutdown()
 
-        self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.RELEASED)
 
     def test_deploy_with_app_nc_and_critical_right(self):
         self.node2 = self.ec.register_resource("omf::Node")
@@ -440,20 +439,20 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase):
 
         self.ec.wait_finished([self.app1, self.app2, self.app3])
 
-        self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.STOPPED)
-        self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.FAILED)
-        self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.STOPPED)
+        self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.STOPPED)
+        self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.STOPPED)
 
         self.ec.shutdown()
 
-        self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.RELEASED)
 
 
     def test_deploy_with_many_app_nc_and_critical(self):
@@ -530,26 +529,26 @@ class OMFVLCWrongCaseWithNonCriticalDep(unittest.TestCase):
 
         self.ec.wait_finished([self.app1, self.app2, self.app3, self.app4, self.app5, self.app6])
 
-        self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.STOPPED)
-        self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.FAILED)
-        self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.STOPPED)
-        self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.STOPPED)
-        self.assertEquals(self.ec.get_resource(self.app5).state, ResourceState.FAILED)
-        self.assertEquals(self.ec.get_resource(self.app6).state, ResourceState.STOPPED)
+        self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.STOPPED)
+        self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.STOPPED)
+        self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.STOPPED)
+        self.assertEqual(self.ec.get_resource(self.app5).state, ResourceState.FAILED)
+        self.assertEqual(self.ec.get_resource(self.app6).state, ResourceState.STOPPED)
 
         self.ec.shutdown()
 
-        self.assertEquals(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app2).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app3).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app4).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app5).state, ResourceState.RELEASED)
-        self.assertEquals(self.ec.get_resource(self.app6).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.node2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.iface2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.channel).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app1).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app2).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app3).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app4).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app5).state, ResourceState.RELEASED)
+        self.assertEqual(self.ec.get_resource(self.app6).state, ResourceState.RELEASED)
 
 
 if __name__ == '__main__':