openstack
/
nova
Code Issues Proposed changes

Merge "trivial: Resolve "X is renamed to Y" warnings"

This commit is contained in:
Zuul 2018-02-20 01:02:11 +00:00 committed by Gerrit Code Review
parent 14458d9f93 33f544e30f
commit 41250d5c00
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/compute/test_compute.py
View File

@ -8612,7 +8612,7 @@ class ComputeAPITestCase(BaseTestCase):
def test_populate_instance_for_create_encrypted(self, num_instances=1):
CONF.set_override('enabled', True,
group='ephemeral_storage_encryption')
CONF.set_override('api_class',
CONF.set_override('backend',
'castellan.tests.unit.key_manager.mock_key_manager.'
'MockKeyManager',
group='key_manager')

2
nova/tests/unit/network/security_group/test_neutron_driver.py
View File

@ -152,7 +152,7 @@ class TestNeutronDriver(test.NoDBTestCase):
with mock.patch.object(neutronv20, 'find_resourceid_by_name_or_id',
return_value=expected_sg_id):
observed_sg = sg_api.get(self.context, name=sg_name)
expected_sg['security_group']['project_id'] = self.context.tenant
expected_sg['security_group']['project_id'] = self.context.project_id
del expected_sg['security_group']['tenant_id']
self.assertEqual(expected_sg['security_group'], observed_sg)
self.mocked_client.show_security_group.assert_called_once_with(