X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=blobdiff_plain;f=test%2Fresources%2Fomf%2Fomf5_vlc_wrong_non_critical.py;fp=test%2Fresources%2Fomf%2Fomf5_vlc_wrong_non_critical.py;h=34209b25b2e871dae8970b8008d3039717952bd4;hp=fee1727b78c55a5dce7d25697f8d24887d398506;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hpb=58a2b493f8df1072a1faa653c8abb6a3f9ba21fa

diff --git a/test/resources/omf/omf5_vlc_wrong_non_critical.py b/test/resources/omf/omf5_vlc_wrong_non_critical.py
index fee1727b..34209b25 100755
--- a/test/resources/omf/omf5_vlc_wrong_non_critical.py
+++ b/test/resources/omf/omf5_vlc_wrong_non_critical.py
@@ -96,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")
@@ -140,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")
@@ -182,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")
@@ -237,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")
@@ -281,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):
@@ -375,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")
@@ -439,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):
@@ -529,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__':