change assertEquals to assertEqual

According to http://docs.python.org/2/library/unittest.html
assertEquals is a deprecated alias of assertEqual.

Change-Id: Ic65fb8fad923adc04d90ea9622b23a2ae8290a3a
This commit is contained in:
Christian Berendt 2013-10-24 07:41:22 +02:00
parent 80c742c7ad
commit 3bf5177782
3 changed files with 9 additions and 9 deletions

View File

@ -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):

View File

@ -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):

View File

@ -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())