openstack
/
cinder
Code Issues Proposed changes

Tighten unit test dict assertions 

Assert that a key is not present rather than
that .get(key) returns None.

Closes-Bug: #1613154

Change-Id: Ic165676b2574a0dcf0ad8714c8328dd82c2681f7
This commit is contained in:
Eric Harney 2019-08-08 10:20:16 -04:00
parent f2b0de24c6
commit 858900f1ba
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/unit/volume/drivers/dell_emc/test_xtremio.py
View File

@ -731,7 +731,7 @@ class XtremIODriverISCSITestCase(BaseXtremIODriverTestCase):
self.driver.create_volume(self.data.test_volume2)
map_data = self.driver.initialize_connection(self.data.test_volume,
self.data.connector)
self.assertIsNone(map_data['data'].get('access_mode'))
self.assertNotIn('access_mode', map_data['data'])
c1 = xms_data['clusters'][1]
c1['chap-authentication-mode'] = 'initiator'
c1['chap-discovery-mode'] = 'initiator'

4
cinder/tests/unit/volume/drivers/huawei/test_huawei_drivers.py
View File

@ -4781,7 +4781,7 @@ class HuaweiFCDriverTestCase(HuaweiTestBase):
self.assertEqual(disk_type_value['disktype'],
data['pools'][0]['disk_type'])
else:
self.assertIsNone(data['pools'][0].get('disk_type'))
self.assertNotIn('disk_type', data['pools'][0])
def test_get_disk_type_pool_info_none(self):
driver = FakeISCSIStorage(configuration=self.configuration)
@ -4790,7 +4790,7 @@ class HuaweiFCDriverTestCase(HuaweiTestBase):
self.mock_object(rest_client.RestClient, 'get_pool_info',
return_value=None)
data = driver.get_volume_stats()
self.assertIsNone(data['pools'][0].get('disk_type'))
self.assertNotIn('disk_type', data['pools'][0])
def test_extend_volume(self):
self.driver.extend_volume(self.volume, 3)

4
cinder/tests/unit/volume/drivers/solidfire/test_solidfire.py
View File

@ -470,7 +470,7 @@ class SolidFireVolumeTestCase(test.TestCase):
model_update = sfv.create_volume(testvol)
self.assertIsNotNone(model_update)
self.assertIsNone(model_update.get('provider_geometry', None))
self.assertNotIn('provider_geometry', model_update)
@mock.patch.object(solidfire.SolidFireDriver, '_issue_api_request')
@mock.patch.object(solidfire.SolidFireDriver, '_create_template_account')
@ -1318,7 +1318,7 @@ class SolidFireVolumeTestCase(test.TestCase):
sfv = solidfire.SolidFireDriver(configuration=self.configuration)
model_update = sfv.manage_existing(testvol, external_ref)
self.assertIsNotNone(model_update)
self.assertIsNone(model_update.get('provider_geometry', None))
self.assertNotIn('provider_geometry', model_update)
def test_manage_existing_get_size(self):
external_ref = {'name': 'existing volume', 'source-id': 5}