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
/
execution
/
resource.py
diff --git
a/test/execution/resource.py
b/test/execution/resource.py
index
188dbaf
..
6a4fd8c
100755
(executable)
--- a/
test/execution/resource.py
+++ b/
test/execution/resource.py
@@
-130,7
+130,7
@@
class ErrorApplication(ResourceManager):
self.ec.schedule("0.5s", self.deploy)
else:
time.sleep(random.random() * 2)
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):
class ResourceFactoryTestCase(unittest.TestCase):
def test_add_resource_factory(self):
@@
-141,16
+141,16
@@
class ResourceFactoryTestCase(unittest.TestCase):
ResourceFactory.register_type(AnotherResource)
# Take into account default 'Critical' attribute
ResourceFactory.register_type(AnotherResource)
# Take into account default 'Critical' attribute
- self.assertEqual
s
(MyResource.get_rtype(), "MyResource")
- self.assertEqual
s
(len(MyResource._attributes), 3)
+ self.assertEqual(MyResource.get_rtype(), "MyResource")
+ self.assertEqual(len(MyResource._attributes), 3)
- self.assertEqual
s
(ResourceManager.get_rtype(), "Resource")
- self.assertEqual
s
(len(ResourceManager._attributes), 2)
+ self.assertEqual(ResourceManager.get_rtype(), "Resource")
+ self.assertEqual(len(ResourceManager._attributes), 2)
- self.assertEqual
s
(AnotherResource.get_rtype(), "AnotherResource")
- self.assertEqual
s
(len(AnotherResource._attributes), 2)
+ self.assertEqual(AnotherResource.get_rtype(), "AnotherResource")
+ self.assertEqual(len(AnotherResource._attributes), 2)
- self.assertEqual
s
(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
# 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)
for (group, state, time) in conditions:
waiting_for.extend(group)
- self.assertEqual
s
(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)
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)
for (group, state, time) in conditions:
waiting_for.extend(group)
- self.assertEqual
s
(waiting_for, [5, 7, 10, 8])
+ self.assertEqual(waiting_for, [5, 7, 10, 8])
def test_deploy_in_order(self):
"""
def test_deploy_in_order(self):
"""
@@
-269,7
+269,7
@@
class ResourceManagerTestCase(unittest.TestCase):
node = ec.register_resource("Node")
apps = list()
node = ec.register_resource("Node")
apps = list()
- for i in
x
range(1000):
+ for i in range(1000):
app = ec.register_resource("Application")
ec.register_connection(app, node)
apps.append(app)
app = ec.register_resource("Application")
ec.register_connection(app, node)
apps.append(app)
@@
-306,7
+306,7
@@
class ResourceManagerTestCase(unittest.TestCase):
ec.shutdown()
ec.shutdown()
- self.assertEqual
s
(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
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)
ec.register_connection(eapp, node)
apps.append(eapp)
- for i in
x
range(10):
+ for i in range(10):
app = ec.register_resource("Application")
ec.register_connection(app, node)
apps.append(app)
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)
ec.wait_finished(apps)
state = ec.state(eapp)
- self.assertEqual
s
(state, ResourceState.FAILED)
+ self.assertEqual(state, ResourceState.FAILED)
apps.remove(eapp)
for app in apps:
state = ec.state(app)
apps.remove(eapp)
for app in apps:
state = ec.state(app)
- self.assertEqual
s
(state, ResourceState.STOPPED)
+ self.assertEqual(state, ResourceState.STOPPED)
ec.shutdown()
ec.shutdown()
- self.assertEqual
s
(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
def test_start_with_condition(self):
from nepi.execution.resource import ResourceFactory