diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py index 09bc0628ad..1f4aa0b2c2 100644 --- a/heat/tests/test_engine_service.py +++ b/heat/tests/test_engine_service.py @@ -466,8 +466,8 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase): result = self.man.create_stack(self.ctx, stack_name, template, params, None, {}) self.m.VerifyAll() - self.assertEquals(stack.identifier(), result) - self.assertEquals(3, stack.total_resources()) + self.assertEqual(stack.identifier(), result) + self.assertEqual(3, stack.total_resources()) stack.delete() def test_stack_create_total_resources_exceeds_max(self): @@ -627,7 +627,7 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase): self.assertEqual(old_stack.identifier(), result) self.assertTrue(isinstance(result, dict)) self.assertTrue(result['stack_id']) - self.assertEquals(3, old_stack.root_stack.total_resources()) + self.assertEqual(3, old_stack.root_stack.total_resources()) self.m.VerifyAll() def test_stack_update_exceeds_resource_limit(self): diff --git a/heat/tests/test_event.py b/heat/tests/test_event.py index 68d0a78170..515fb21605 100644 --- a/heat/tests/test_event.py +++ b/heat/tests/test_event.py @@ -113,14 +113,14 @@ class EventTest(HeatTestCase): 'alabama', self.resource.properties, self.resource.name, self.resource.type()) e.store() - self.assertEquals(1, len(db_api.event_get_all_by_stack(self.ctx, - self.stack.id))) + self.assertEqual(1, len(db_api.event_get_all_by_stack(self.ctx, + self.stack.id))) e = event.Event(self.ctx, self.stack, 'TEST', 'IN_PROGRESS', 'Testing', 'arizona', self.resource.properties, self.resource.name, self.resource.type()) e.store() events = db_api.event_get_all_by_stack(self.ctx, self.stack.id) - self.assertEquals(1, len(events)) + self.assertEqual(1, len(events)) self.assertEqual('arizona', events[0].physical_resource_id) def test_identifier(self): diff --git a/heat/tests/test_nested_stack.py b/heat/tests/test_nested_stack.py index ac5080bdd9..8bd42a6a79 100644 --- a/heat/tests/test_nested_stack.py +++ b/heat/tests/test_nested_stack.py @@ -121,7 +121,7 @@ Outputs: props['TimeoutInMinutes'] = '50' stack = self.create_stack(json.dumps(timeout_template)) - self.assertEquals(stack.state, (stack.CREATE, stack.COMPLETE)) + self.assertEqual(stack.state, (stack.CREATE, stack.COMPLETE)) self.m.VerifyAll() def test_nested_stack_create_exceeds_resource_limit(self): @@ -146,7 +146,7 @@ Outputs: t = template_format.parse(self.test_template) stack = self.parse_stack(t) stack.create() - self.assertEquals(stack.state, (stack.CREATE, stack.FAILED)) + self.assertEqual(stack.state, (stack.CREATE, stack.FAILED)) self.assertIn('Maximum resources per stack exceeded', stack.status_reason) @@ -174,7 +174,7 @@ Outputs: t = template_format.parse(self.test_template) stack = self.parse_stack(t) stack.create() - self.assertEquals(stack.state, (stack.CREATE, stack.COMPLETE)) + self.assertEqual(stack.state, (stack.CREATE, stack.COMPLETE)) self.assertIn('NestedResource', stack['the_nested'].nested())