X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fomf%2Fwilab_node.py;h=132ceb8f8ef676fa1ccba24519119a7415783fdc;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=48b7f0556fb0cb9ad0da4366bec0e111a303f893;hpb=665cc9b410de55b1013ad86b4764b07f2b1e5f42;p=nepi.git

diff --git a/test/resources/omf/wilab_node.py b/test/resources/omf/wilab_node.py
index 48b7f055..132ceb8f 100755
--- a/test/resources/omf/wilab_node.py
+++ b/test/resources/omf/wilab_node.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
@@ -35,8 +34,8 @@ class DummyEC(ExperimentController):
 class WilabtSfaNodeFactoryTestCase(unittest.TestCase):
 
     def test_creation_phase(self):
-        self.assertEquals(WilabtSfaNode._rtype, "WilabtSfaNode")
-        self.assertEquals(len(WilabtSfaNode._attributes), 17)
+        self.assertEqual(WilabtSfaNode._rtype, "WilabtSfaNode")
+        self.assertEqual(len(WilabtSfaNode._attributes), 17)
 
 class WilabtSfaNodeTestCase(unittest.TestCase):
     """
@@ -76,8 +75,8 @@ class WilabtSfaNodeTestCase(unittest.TestCase):
 
         api1 = wnode_rm1.sfaapi
         self.assertIsInstance(api1, SFAAPI)
-        self.assertEquals(len(api1._reserved), 0)
-        self.assertEquals(len(api1._blacklist), 0)
+        self.assertEqual(len(api1._reserved), 0)
+        self.assertEqual(len(api1._blacklist), 0)
 
         node2 = self.ec.register_resource("WilabtSfaNode")
         self.ec.set(node2, "host", "zotacM20")
@@ -89,7 +88,7 @@ class WilabtSfaNodeTestCase(unittest.TestCase):
 
         wnode_rm2 = self.ec.get_resource(node2)
         api2 = wnode_rm2.sfaapi
-        self.assertEquals(api1, api2)
+        self.assertEqual(api1, api2)
 
         wnode_rm1.sfaapi._reserved = set()
         wnode_rm1.sfaapi._blacklist = set()
@@ -112,11 +111,11 @@ class WilabtSfaNodeTestCase(unittest.TestCase):
         host = wnode_rm.get("host")
         self.assertIsNotNone(host)
 
-        self.assertEquals(wnode_rm.sfaapi._reserved, set())
+        self.assertEqual(wnode_rm.sfaapi._reserved, set())
 
         wnode_rm.do_discover()
-        self.assertEquals(len(wnode_rm.sfaapi._reserved), 1)
-        self.assertEquals(wnode_rm._node_to_provision, 'wilab2.ilabt.iminds.be.zotacE5')
+        self.assertEqual(len(wnode_rm.sfaapi._reserved), 1)
+        self.assertEqual(wnode_rm._node_to_provision, 'wilab2.ilabt.iminds.be.zotacE5')
 
         wnode_rm.sfaapi._reserved = set()
         wnode_rm.sfaapi._blacklist = set()
@@ -137,7 +136,7 @@ class WilabtSfaNodeTestCase(unittest.TestCase):
 
         wnode_rm = self.ec.get_resource(node)
 
-        self.assertEquals(wnode_rm.sfaapi._reserved, set())
+        self.assertEqual(wnode_rm.sfaapi._reserved, set())
         self.assertIsNone(wnode_rm._node_to_provision)
 
         wnode_rm.do_discover()
@@ -148,7 +147,7 @@ class WilabtSfaNodeTestCase(unittest.TestCase):
         if not self.ec.abort and self.ec.state(node) > 2:
             cmd = 'echo "IT WORKED"'
             ((out, err), proc) = wnode_rm.execute(cmd)
-            self.assertEquals(out.strip(), "IT WORKED")
+            self.assertEqual(out.strip(), "IT WORKED")
 
         #wnode_rm.sfaapi._reserved = set()
         #wnode_rm.sfaapi._blacklist = set()
@@ -241,8 +240,8 @@ class WilabtSfaNodeTestCase(unittest.TestCase):
         state1 = self.ec.state(node1)
         state2 = self.ec.state(node2)
         if not self.ec.abort:
-            self.assertEquals(state1, (3, 4))
-            self.assertEquals(state2, (3, 4))
+            self.assertEqual(state1, (3, 4))
+            self.assertEqual(state2, (3, 4))
 
         self.ec.shutdown()