openstack/deb-heat
Code Issues Proposed changes

Merge "Modify assert statement when comparing with None"

Browse Source
This commit is contained in:
Jenkins 2014-03-12 16:45:53 +00:00 committed by Gerrit Code Review
commit ab1f21ae3f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/tests/test_clients.py
View File

@ -30,7 +30,7 @@ class ClientsTest(HeatTestCase):
obj = clients.Clients(con)
obj._get_client_option = mock.Mock()
obj._get_client_option.return_value = None
self.assertEqual(None, obj._get_heat_url())
self.assertIsNone(obj._get_heat_url())
heat_url = "http://0.0.0.0:8004/v1/%(tenant_id)s"
obj._get_client_option.return_value = heat_url
tenant_id = "b363706f891f48019483f8bd6503c54b"

4
heat/tests/test_engine_service.py
View File

@ -917,7 +917,7 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
self.assertEqual((old_stack.UPDATE, old_stack.COMPLETE),
old_stack.state)
self.assertEqual(create_stack.identifier(), result)
self.assertNotEqual(None, create_stack.identifier().stack_id)
self.assertIsNotNone(create_stack.identifier().stack_id)
self.assertEqual(create_stack.identifier().arn(),
old_stack['A'].properties['Foo'])
@ -998,7 +998,7 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
self.assertEqual((old_nested.UPDATE, old_nested.COMPLETE),
old_nested.state)
self.assertEqual(create_stack.identifier(), result)
self.assertNotEqual(None, create_stack.identifier().stack_id)
self.assertIsNotNone(create_stack.identifier().stack_id)
self.assertEqual(create_nested.identifier().arn(),
old_nested['A'].properties['Foo'])