git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replacing assertEquals into assertEqual
[nepi.git]
/
test
/
resources
/
omf
/
wilab_node.py
diff --git
a/test/resources/omf/wilab_node.py
b/test/resources/omf/wilab_node.py
index
7642e83
..
132ceb8
100755
(executable)
--- a/
test/resources/omf/wilab_node.py
+++ b/
test/resources/omf/wilab_node.py
@@
-34,8
+34,8
@@
class DummyEC(ExperimentController):
class WilabtSfaNodeFactoryTestCase(unittest.TestCase):
def test_creation_phase(self):
class WilabtSfaNodeFactoryTestCase(unittest.TestCase):
def test_creation_phase(self):
- self.assertEqual
s
(WilabtSfaNode._rtype, "WilabtSfaNode")
- self.assertEqual
s
(len(WilabtSfaNode._attributes), 17)
+ self.assertEqual(WilabtSfaNode._rtype, "WilabtSfaNode")
+ self.assertEqual(len(WilabtSfaNode._attributes), 17)
class WilabtSfaNodeTestCase(unittest.TestCase):
"""
class WilabtSfaNodeTestCase(unittest.TestCase):
"""
@@
-75,8
+75,8
@@
class WilabtSfaNodeTestCase(unittest.TestCase):
api1 = wnode_rm1.sfaapi
self.assertIsInstance(api1, SFAAPI)
api1 = wnode_rm1.sfaapi
self.assertIsInstance(api1, SFAAPI)
- self.assertEqual
s
(len(api1._reserved), 0)
- self.assertEqual
s
(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")
node2 = self.ec.register_resource("WilabtSfaNode")
self.ec.set(node2, "host", "zotacM20")
@@
-88,7
+88,7
@@
class WilabtSfaNodeTestCase(unittest.TestCase):
wnode_rm2 = self.ec.get_resource(node2)
api2 = wnode_rm2.sfaapi
wnode_rm2 = self.ec.get_resource(node2)
api2 = wnode_rm2.sfaapi
- self.assertEqual
s
(api1, api2)
+ self.assertEqual(api1, api2)
wnode_rm1.sfaapi._reserved = set()
wnode_rm1.sfaapi._blacklist = set()
wnode_rm1.sfaapi._reserved = set()
wnode_rm1.sfaapi._blacklist = set()
@@
-111,11
+111,11
@@
class WilabtSfaNodeTestCase(unittest.TestCase):
host = wnode_rm.get("host")
self.assertIsNotNone(host)
host = wnode_rm.get("host")
self.assertIsNotNone(host)
- self.assertEqual
s
(wnode_rm.sfaapi._reserved, set())
+ self.assertEqual(wnode_rm.sfaapi._reserved, set())
wnode_rm.do_discover()
wnode_rm.do_discover()
- self.assertEqual
s
(len(wnode_rm.sfaapi._reserved), 1)
- self.assertEqual
s
(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()
wnode_rm.sfaapi._reserved = set()
wnode_rm.sfaapi._blacklist = set()
@@
-136,7
+136,7
@@
class WilabtSfaNodeTestCase(unittest.TestCase):
wnode_rm = self.ec.get_resource(node)
wnode_rm = self.ec.get_resource(node)
- self.assertEqual
s
(wnode_rm.sfaapi._reserved, set())
+ self.assertEqual(wnode_rm.sfaapi._reserved, set())
self.assertIsNone(wnode_rm._node_to_provision)
wnode_rm.do_discover()
self.assertIsNone(wnode_rm._node_to_provision)
wnode_rm.do_discover()
@@
-147,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)
if not self.ec.abort and self.ec.state(node) > 2:
cmd = 'echo "IT WORKED"'
((out, err), proc) = wnode_rm.execute(cmd)
- self.assertEqual
s
(out.strip(), "IT WORKED")
+ self.assertEqual(out.strip(), "IT WORKED")
#wnode_rm.sfaapi._reserved = set()
#wnode_rm.sfaapi._blacklist = set()
#wnode_rm.sfaapi._reserved = set()
#wnode_rm.sfaapi._blacklist = set()
@@
-240,8
+240,8
@@
class WilabtSfaNodeTestCase(unittest.TestCase):
state1 = self.ec.state(node1)
state2 = self.ec.state(node2)
if not self.ec.abort:
state1 = self.ec.state(node1)
state2 = self.ec.state(node2)
if not self.ec.abort:
- self.assertEqual
s
(state1, (3, 4))
- self.assertEqual
s
(state2, (3, 4))
+ self.assertEqual(state1, (3, 4))
+ self.assertEqual(state2, (3, 4))
self.ec.shutdown()
self.ec.shutdown()