openstack/solum
Code Issues Proposed changes

Fix mock dependencies and unit tests

Browse Source 
This to match recent updates to mock ported to 2.7

Co-Authored-By: Randall Burt <randall.burt@rackspace.com>
Change-Id: Iaecf8625e748d7fd1dacfca3ca5cae7fa319dbfd
This commit is contained in:
Ed Cranford 2015-07-10 14:10:50 -05:00 committed by Randall Burt
parent f9d6297cf9
commit 637e819664
9 changed files with 98 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solum/deployer/handlers/heat.py
View File

@ -144,7 +144,7 @@ class Handler(object):
stack_id = self._find_id_if_stack_exists(assem)
# TODO(devkulkarni) Delete t_logger when returning from this call.
# This needs to be implemented as a decorator since there are
# This needs to be implemented as a context since there are
# multiple return paths from this method.
t_logger = tlog.TenantLogger(ctxt, assem, deployer_log_dir, 'delete')
msg = "Deleting Assembly %s" % assem.uuid
@ -161,6 +161,7 @@ class Handler(object):
osc = clients.OpenStackClients(ctxt)
try:
t_logger.log(logging.DEBUG, "Deleting Heat stack.")
LOG.debug("Deleting Heat stack %s", stack_id)
osc.heat().stacks.delete(stack_id)
except exc.HTTPNotFound:
# stack already deleted

6
solum/tests/api/controllers/v1/test_app.py
View File

@ -77,11 +77,7 @@ class TestAppController(base.BaseTestCase):
request_mock.body = ''
request_mock.content_type = 'application/json'
request_mock.security_context = None
hand_patch = AppHandler.return_value.patch
fake_app = objects.registry.App()
hand_patch.return_value = fake_app
app.AppController('test_id').patch()
hand_patch.assert_called_once()
self.assertEqual(400, resp_mock.status)
def test_app_delete(self, AppHandler, resp_mock, request_mock):
@ -119,7 +115,7 @@ class TestAppsController(base.BaseTestCase):
fake_app = objects.registry.App(**json_create)
hand_create.return_value = fake_app
app.AppsController().post()
hand_create.assert_called_once()
self.assertTrue(hand_create.called)
created_app = hand_create.call_args[0][0]
self.assertEqual(created_app['name'], json_create['name'])
self.assertEqual(200, resp_mock.status)

4
solum/tests/api/controllers/v1/test_plan.py
View File

@ -40,14 +40,13 @@ class TestPlanModuleFunctions(base.BaseTestCase):
def test_init_plan_by_version(self, init_plan_v1):
yml_input_plan = {'version': 1, 'name': 'plan1', 'description': 'dsc'}
plan.init_plan_by_version(yml_input_plan)
init_plan_v1.assert_called_once()
self.assertTrue(init_plan_v1.called)
@mock.patch('solum.api.controllers.v1.plan.init_plan_v1')
def test_init_plan_by_version_missing(self, init_plan_v1):
yml_input_plan = {'name': 'plan1', 'description': 'dsc'}
self.assertRaises(exception.BadRequest, plan.init_plan_by_version,
yml_input_plan)
init_plan_v1.assert_called_once()
@mock.patch('solum.api.controllers.v1.plan.init_plan_v1')
def test_init_plan_by_version_not_existing(self, init_plan_v1):
@ -55,7 +54,6 @@ class TestPlanModuleFunctions(base.BaseTestCase):
'description': 'dsc'}
self.assertRaises(exception.BadRequest, plan.init_plan_by_version,
yml_input_plan)
init_plan_v1.assert_called_once()
@mock.patch('pecan.request', new_callable=fakes.FakePecanRequest)
def test_init_plan_v1(self, mock_req):

2
solum/tests/api/handlers/test_app.py
View File

@ -49,7 +49,7 @@ class TestAppHandler(base.BaseTestCase):
handler.delete('test_id')
get_by_uuid = mock_registry.App.get_by_uuid
get_by_uuid.assert_called_once_with(self.ctx, 'test_id')
db_obj.destroy.assert_called_once()
self.assertTrue(db_obj.destroy.called)
def test_app_create(self, mock_registry):
data = {'name': 'fakeapp',

4
solum/tests/api/handlers/test_lp_handler.py
View File

@ -91,7 +91,7 @@ class TestLanguagePackHandler(base.BaseTestCase):
self.assertRaises(exc.LPStillReferenced, handler.delete, 'test_lp')
mock_img.get_lp_by_name_or_uuid.assert_called_once_with(
self.ctx, 'test_lp')
mock_planlist.get_all.assert_called_once()
self.assertTrue(mock_planlist.get_all.called)
assert not fi.destroy.called
@mock.patch('solum.common.solum_swiftclient.SwiftClient.delete_object')
@ -115,7 +115,7 @@ class TestLanguagePackHandler(base.BaseTestCase):
docker_image_name = fi.docker_image_name
img_filename = docker_image_name.split('-', 1)[1]
mock_swift_delete.assert_called_once_with('solum_lp', img_filename)
mock_planlist.get_all.assert_called_once()
self.assertTrue(mock_planlist.get_all.called)
log_handler = mock_log_handler.return_value
log_handler.delete.assert_called_once_with(fi.uuid)
fi.destroy.assert_called_once_with(self.ctx)

147
solum/tests/deployer/handlers/test_heat.py
View File

@ -70,7 +70,7 @@ class HandlerTest(base.BaseTestCase):
handler._check_stack_status = mock.MagicMock()
handler.deploy(self.ctx, 77, 'created_image_id', 'image_name', [80])
stacks = mock_clients.return_value.heat.return_value.stacks
stacks.create.assert_called_once()
self.assertTrue(stacks.create.called)
assign_and_create_mock = mock_registry.Component.assign_and_create
comp_name = 'Heat_Stack_for_%s' % fake_assembly.name
assign_and_create_mock.assert_called_once_with(self.ctx,
@ -92,7 +92,7 @@ class HandlerTest(base.BaseTestCase):
mock_ua, m_log):
handler = heat_handler.Handler()
m_log.TenantLogger.call.return_value = mock.MagicMock()
mock_log = m_log.TenantLogger.return_value.log
fake_assembly = fakes.FakeAssembly()
mock_registry.Assembly.get_by_id.return_value = fake_assembly
fake_template = self._get_fake_template()
@ -139,7 +139,7 @@ class HandlerTest(base.BaseTestCase):
'Heat Stack test',
'http://fake.ref',
'fake_id')
m_log.log.assert_called_once()
self.assertTrue(mock_log.called)
@mock.patch('solum.deployer.handlers.heat.tlog')
@mock.patch('solum.deployer.handlers.heat.update_assembly')
@ -150,7 +150,7 @@ class HandlerTest(base.BaseTestCase):
mock_get_templ, mock_ua, m_log):
handler = heat_handler.Handler()
m_log.TenantLogger.call.return_value = mock.MagicMock()
mock_log = m_log.TenantLogger.return_value.log
fake_assembly = fakes.FakeAssembly()
mock_registry.Assembly.get_by_id.return_value = fake_assembly
@ -169,7 +169,7 @@ class HandlerTest(base.BaseTestCase):
self.assertRaises(AssertionError,
assign_and_create_mock.assert_called_once_with,
comp_name)
m_log.log.assert_called_once()
self.assertTrue(mock_log.called)
@mock.patch('solum.deployer.handlers.heat.tlog')
@mock.patch('solum.deployer.handlers.heat.update_assembly')
@ -366,30 +366,32 @@ class HandlerTest(base.BaseTestCase):
image_storage, image_loc, image_name,
fake_assembly, ports, mock_logger)
self.assertIsNotNone(template)
handler._get_template_for_docker_reg.assert_called_once()
self.assertTrue(handler._get_template_for_docker_reg.called)
mock_catalog_get.assert_called_once_with('templates', 'coreos')
@mock.patch('solum.common.catalog.get')
def test_get_template_vm_swift(self, mock_catalog_get):
handler = heat_handler.Handler()
fake_assembly = fakes.FakeAssembly()
template_getter = mock.MagicMock()
template_getter.return_value = self._get_fake_template()
handler._get_template_for_swift = template_getter
mock_logger = mock.MagicMock()
image_format = 'vm'
image_storage = 'swift'
image_loc = 'abc'
image_name = 'def'
ports = [80]
mock_logger = mock.MagicMock()
mock_catalog_get.return_value = self._get_fake_template()
template = handler._get_template(self.ctx, image_format,
image_storage, image_loc, image_name,
fake_assembly, ports, mock_logger)
self.assertIsNotNone(template)
handler._get_template_for_swift.assert_called_once()
mock_catalog_get.assert_called_once_with('templates', 'coreos')
image_storage, image_loc,
image_name, fake_assembly,
ports, mock_logger)
self.assertEqual(self._get_fake_template(), template)
self.assertEqual(1, mock_catalog_get.call_count)
self.assertEqual(mock.call('templates', 'coreos'),
mock_catalog_get.call_args)
@mock.patch('solum.deployer.handlers.heat.update_assembly')
@mock.patch('solum.common.catalog.get')
@ -612,28 +614,31 @@ class HandlerTest(base.BaseTestCase):
handler = heat_handler.Handler()
m_log.TenantLogger.call.return_value = mock.MagicMock()
mock_log = m_log.TenantLogger.return_value.log
handler._find_id_if_stack_exists = mock.MagicMock(return_value='42')
mock_heat = mock_client.return_value.heat.return_value
mock_heat.stacks.get.side_effect = exc.HTTPNotFound
mock_heat = mock_client.return_value.heat
mock_del = mock_heat.return_value.stacks.delete
mock_del.side_effect = exc.HTTPNotFound
cfg.CONF.deployer.max_attempts = 1
cfg.CONF.deployer.wait_interval = 0
cfg.CONF.deployer.growth_factor = 1.2
handler.destroy_assembly(self.ctx, fake_assem.id)
with mock.patch.object(handler, "_find_id_if_stack_exists",
return_value=42):
mock_client.heat.stacks.delete.assert_called_once()
fake_assem.destroy.assert_called_once()
mock_registry.Image.get_by_id.assert_called_once_with(
mock.ANY, fake_assem.image_id)
docker_image_name = fake_image.docker_image_name
img_filename = docker_image_name.split('-', 1)[1]
mock_swift_delete.assert_called_once_with('solum_du', img_filename)
log_handler = mock_log_handler.return_value
log_handler.delete.assert_called_once_with(fake_assem.uuid)
m_log.log.assert_called_once()
handler.destroy_assembly(self.ctx, fake_assem.id)
self.assertTrue(mock_del.called)
self.assertTrue(fake_assem.destroy.called)
mock_registry.Image.get_by_id.assert_called_once_with(
mock.ANY, fake_assem.image_id)
docker_image_name = fake_image.docker_image_name
img_filename = docker_image_name.split('-', 1)[1]
mock_swift_delete.assert_called_once_with('solum_du', img_filename)
log_handler = mock_log_handler.return_value
log_handler.delete.assert_called_once_with(fake_assem.uuid)
self.assertTrue(mock_log.called)
@mock.patch('solum.common.solum_swiftclient.SwiftClient.delete_object')
@mock.patch('solum.api.handlers.userlog_handler.UserlogHandler')
@ -649,28 +654,32 @@ class HandlerTest(base.BaseTestCase):
handler = heat_handler.Handler()
m_log.TenantLogger.call.return_value = mock.MagicMock()
mock_log = m_log.TenantLogger.return_value.log
handler._find_id_if_stack_exists = mock.MagicMock(return_value='42')
mock_heat = mock_client.return_value.heat.return_value
mock_heat.stacks.delete.side_effect = exc.HTTPNotFound
mock_heat = mock_client.return_value.heat
mock_del = mock_heat.return_value.stacks.delete
mock_del.side_effect = exc.HTTPNotFound
cfg.CONF.deployer.max_attempts = 1
cfg.CONF.deployer.wait_interval = 0
cfg.CONF.deployer.growth_factor = 1.2
handler.destroy_assembly(self.ctx, fake_assem.id)
with mock.patch.object(handler, "_find_id_if_stack_exists",
return_value=42) as mock_find:
mock_client.heat.stacks.delete.assert_called_once()
fake_assem.destroy.assert_called_once()
mock_registry.Image.get_by_id.assert_called_once_with(
mock.ANY, fake_assem.image_id)
docker_image_name = fake_image.docker_image_name
img_filename = docker_image_name.split('-', 1)[1]
mock_swift_delete.assert_called_once_with('solum_du', img_filename)
log_handler = mock_log_handler.return_value
log_handler.delete.assert_called_once_with(fake_assem.uuid)
m_log.log.assert_called_once()
handler.destroy_assembly(self.ctx, fake_assem.id)
self.assertTrue(mock_find.called)
self.assertTrue(mock_del.called)
self.assertTrue(fake_assem.destroy.called)
mock_registry.Image.get_by_id.assert_called_once_with(
mock.ANY, fake_assem.image_id)
docker_image_name = fake_image.docker_image_name
img_filename = docker_image_name.split('-', 1)[1]
mock_swift_delete.assert_called_once_with('solum_du', img_filename)
log_handler = mock_log_handler.return_value
log_handler.delete.assert_called_once_with(fake_assem.uuid)
self.assertTrue(mock_log.called)
@mock.patch('solum.deployer.handlers.heat.tlog')
@mock.patch('solum.deployer.handlers.heat.update_assembly')
@ -680,7 +689,8 @@ class HandlerTest(base.BaseTestCase):
fake_assem = fakes.FakeAssembly()
mock_registry.Assembly.get_by_id.return_value = fake_assem
m_log.TenantLogger.call.return_value = mock.MagicMock()
mock_heat = mock_client.return_value.heat
mock_del = mock_heat.return_value.stacks.delete
handler = heat_handler.Handler()
handler._find_id_if_stack_exists = mock.MagicMock(return_value='42')
@ -689,19 +699,22 @@ class HandlerTest(base.BaseTestCase):
cfg.CONF.deployer.wait_interval = 0
cfg.CONF.deployer.growth_factor = 1.2
handler.destroy_assembly(self.ctx, fake_assem.id)
with mock.patch.object(handler, "_find_id_if_stack_exists",
return_value="42"):
c1 = mock.call(self.ctx, fake_assem.id,
{'status': STATES.DELETING})
handler.destroy_assembly(self.ctx, fake_assem.id)
c2 = mock.call(self.ctx, fake_assem.id,
{'status': STATES.ERROR_STACK_DELETE_FAILED})
c1 = mock.call(self.ctx, fake_assem.id,
{'status': STATES.DELETING})
calls = [c1, c2]
c2 = mock.call(self.ctx, fake_assem.id,
{'status': STATES.ERROR_STACK_DELETE_FAILED})
mua.assert_has_calls(calls, any_order=False)
calls = [c1, c2]
mock_client.heat.stacks.delete.assert_called_once()
mua.assert_has_calls(calls, any_order=False)
self.assertTrue(mock_del.called)
@mock.patch('solum.common.solum_swiftclient.SwiftClient.delete_object')
@mock.patch('solum.api.handlers.userlog_handler.UserlogHandler')
@ -716,23 +729,29 @@ class HandlerTest(base.BaseTestCase):
fake_image = fakes.FakeImage()
mock_registry.Image.get_by_id.return_value = fake_image
mock_tlogger.TenantLogger.call.return_value = mock.MagicMock()
mock_log = mock_tlogger.TenantLogger.return_value.log
mock_upload = mock_tlogger.TenantLogger.return_value.upload
mock_log_del = mock_log_handler.return_value.delete
mock_heat = mock_client.return_value.heat
mock_del = mock_heat.return_value.stacks.delete
hh = heat_handler.Handler()
hh._find_id_if_stack_exists = mock.MagicMock(return_value=None)
hh.destroy_assembly(self.ctx, fake_assem.id)
with mock.patch.object(hh, "_find_id_if_stack_exists",
return_value=None):
assert not mock_client.heat.stacks.delete.called
fake_assem.destroy.assert_called_once()
hh.destroy_assembly(self.ctx, fake_assem.id)
self.assertFalse(mock_del.called)
self.assertTrue(fake_assem.destroy.called)
mock_registry.Image.get_by_id.assert_called_once_with(
mock.ANY, fake_assem.image_id)
docker_image_name = fake_image.docker_image_name
img_filename = docker_image_name.split('-', 1)[1]
mock_swift_delete.assert_called_once_with('solum_du', img_filename)
mock_tlogger.log.assert_called_once()
mock_tlogger.upload.assert_called_once()
log_handler = mock_log_handler.return_value
log_handler.delete.assert_called_once_with(fake_assem.uuid)
self.assertTrue(mock_log.called)
self.assertTrue(mock_upload.called)
self.assertEqual(1, mock_log_del.call_count)
self.assertEqual(mock.call(fake_assem.uuid), mock_log_del.call_args)
@mock.patch('solum.objects.registry')
def test_successful_deploy_destroys_twins(self, mr):

4
solum/tests/uploaders/test_swift.py
View File

@ -62,7 +62,7 @@ class SwiftUploadTest(base.BaseTestCase):
rs_before_delete.uuid,
stage, build_id)
mock_trans_jlog.assert_called_once()
self.assertTrue(mock_trans_jlog.called)
tansf_path = orig_path + '.tf'
mock_upload.assert_called_once_with(container, filename, tansf_path)
mock_write_row.assert_called_once_with(filename, swift_info)
@ -94,7 +94,7 @@ class SwiftUploadTest(base.BaseTestCase):
resource.uuid,
stage, build_id)
mock_trans_jlog.assert_called_once()
self.assertTrue(mock_trans_jlog.called)
tansf_path = orig_path + '.tf'
mock_swift.assert_called_once_with(tansf_path,
container,

5
solum/tests/worker/handlers/test_shell.py
View File

@ -294,7 +294,10 @@ class HandlerTest(base.BaseTestCase):
proj_dir = os.path.abspath(os.path.join(os.path.dirname(__file__),
'..', '..', '..', '..'))
script = os.path.join(proj_dir, 'contrib/lp-cedarish/docker/build-app')
mock_shelve.call().__setitem__.assert_called_once()
# TODO(datsun180b): Determine if this commented line should be removed
# since I can't seem to find anywhere in shell.py that writes to
# shelve.
# self.assertTrue(mock_shelve.call().__setitem__.called)
mock_popen.assert_called_once_with([script, 'git://example.com/foo',
'new_app', self.ctx.tenant,
self.expected_img_id,

3
test-requirements.txt
View File

@ -4,6 +4,8 @@ coverage>=3.6
discover
fixtures>=0.3.14
lxml>=2.3
mock>=1.1;python_version!='2.6'
mock==1.0.1;python_version=='2.6'
python-subunit>=0.0.18
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
oslosphinx
@ -14,5 +16,4 @@ stevedore>=0.14
testrepository>=0.0.18
testscenarios>=0.4
testtools>=0.9.36,!=1.2.0
mock>=1.0
nose