openstack
/
nova
Code Issues Proposed changes

Merge "Fix py27 gate failure - test_create_instance_both_bdm_formats"

This commit is contained in:
Jenkins 2015-01-20 02:46:15 +00:00 committed by Gerrit Code Review
parent 29002caa22 abd6d880bc
commit e8384a4617
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova/tests/unit/api/openstack/compute/contrib/test_block_device_mapping_v1.py
View File

@ -329,12 +329,17 @@ class BlockDeviceMappingTestV21(test.TestCase):
self._test_create(params, override_controller=controller)
def test_create_instance_both_bdm_formats(self):
ext_info = plugins.LoadedExtensionInfo()
CONF.set_override('extensions_blacklist', '', 'osapi_v3')
both_controllers = servers_v3.ServersController(
extension_info=ext_info)
bdm = [{'device_name': 'foo'}]
bdm_v2 = [{'source_type': 'volume',
'uuid': 'fake_vol'}]
params = {'block_device_mapping': bdm,
'block_device_mapping_v2': bdm_v2}
self.assertRaises(exc.HTTPBadRequest, self._test_create, params)
self.assertRaises(exc.HTTPBadRequest, self._test_create, params,
override_controller=both_controllers)
class BlockDeviceMappingTestV2(BlockDeviceMappingTestV21):