py34: test_engine_*

* test_case: mock.ANY is not hashable, so replace with a random graph key
* test_case: convert all maps to lists before asserting against raw data

partial blueprint heat-python34-support

Change-Id: I103a6bc297d8f533ca4885af4c6593b6b8176b80
This commit is contained in:
Sirushti Murugesan 2015-08-01 14:51:41 +05:30
parent f572b71298
commit b1e374c126
3 changed files with 11 additions and 2 deletions

View File

@ -504,7 +504,7 @@ class MiscMethodsTest(common.HeatTestCase):
worker.propagate_check_resource(
self.ctx, mock.ANY, mock.ANY,
self.stack.current_traversal, mock.ANY,
mock.ANY, {}, True, None)
('A', True), {}, True, None)
self.assertTrue(mock_sync.called)
@mock.patch.object(resource.Resource, 'create_convergence')

View File

@ -294,7 +294,14 @@ class FormatTest(common.HeatTestCase):
self.assertIsNone(stack.get('status_reason'))
self.assertEqual('test_stack', stack['stack_name'])
self.assertIn('resources', stack)
self.assertEqual(['fmt1', ['fmt2', ['fmt3']]], stack['resources'])
resources = list(stack['resources'])
self.assertEqual('fmt1', resources[0])
resources = list(resources[1])
self.assertEqual('fmt2', resources[0])
resources = list(resources[1])
self.assertEqual('fmt3', resources[0])
kwargs = mock_fmt_resource.call_args[1]
self.assertTrue(kwargs['with_props'])

View File

@ -37,6 +37,7 @@ heat.tests.db.test_sqlalchemy_api
heat.tests.db.test_sqlalchemy_filters
heat.tests.db.test_sqlalchemy_types
heat.tests.db.test_utils
heat.tests.engine.test_engine_worker
heat.tests.engine.test_service_engine
heat.tests.engine.test_stack_action
heat.tests.engine.test_stack_create
@ -85,6 +86,7 @@ heat.tests.test_crypt
heat.tests.test_cw_alarm
heat.tests.test_dbinstance
heat.tests.test_empty_stack
heat.tests.test_engine_api_utils
heat.tests.test_engine_service
heat.tests.test_engine_service_stack_watch
heat.tests.test_environment