openstack
/
cinder
Code Issues Proposed changes

Merge "Remove duplicate keys from dictionary"

This commit is contained in:
Jenkins 2015-08-20 03:26:46 +00:00 committed by Gerrit Code Review
parent 57f3327cae 88ef1d973b
commit 4d5c33cf08
8 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/unit/api/test_common.py
View File

@ -290,7 +290,7 @@ class SortParamUtilsTest(test.TestCase):
common.get_sort_params(params)
self.assertEqual({}, params)
params = {'sort_dir': 'key1', 'sort_dir': 'dir1'}
params = {'sort_key': 'key1', 'sort_dir': 'dir1'}
common.get_sort_params(params)
self.assertEqual({}, params)

2
cinder/tests/unit/api/v1/test_volumes.py
View File

@ -84,7 +84,6 @@ class VolumeApiTest(test.TestCase):
'display_description': 'Volume Test Desc',
'availability_zone': 'zone1:host1',
'display_name': 'Volume Test Name',
'encrypted': False,
'attachments': [],
'multiattach': 'false',
'bootable': 'false',
@ -973,7 +972,6 @@ class TestVolumeCreateRequestXMLDeserializer(test.TestCase):
request = self.deserializer.deserialize(self_request)
expected = {
"volume": {
"display_name": "Volume-xml",
"size": "1",
"display_name": "Volume-xml",
"display_description": "description",

1
cinder/tests/unit/api/v2/stubs.py
View File

@ -46,7 +46,6 @@ def stub_volume(id, **kwargs):
'status': DEFAULT_VOL_STATUS,
'migration_status': None,
'attach_status': 'attached',
'bootable': 'false',
'name': 'vol name',
'display_name': DEFAULT_VOL_NAME,
'display_description': DEFAULT_VOL_DESCRIPTION,

1
cinder/tests/unit/api/v2/test_volumes.py
View File

@ -1575,7 +1575,6 @@ class TestVolumeCreateRequestXMLDeserializer(test.TestCase):
request = self.deserializer.deserialize(self_request)
expected = {
"volume": {
"name": "Volume-xml",
"size": "1",
"name": "Volume-xml",
"description": "description",

1
cinder/tests/unit/scheduler/test_host_manager.py
View File

@ -441,7 +441,6 @@ class HostStateTestCase(test.TestCase):
'reserved_percentage': 0,
'dying_disks': 200,
'super_hero_1': 'superman',
'super_hero_2': ' ',
'super_hero_2': 'Hulk',
}
],

10
cinder/tests/unit/test_emc_vmax.py
View File

@ -411,12 +411,11 @@ class EMCVMAXCommonData(object):
'volume_type_id': 'sourceid',
'display_name': 'sourceVolume',
'name': 'sourceVolume',
'id': 'sourceVolume',
'device_id': '1',
'volume_name': 'vmax-154326',
'provider_auth': None,
'project_id':
'project', 'id': '2',
'project_id': 'project',
'id': '2',
'host': fake_host,
'provider_location':
six.text_type(provider_location),
@ -426,12 +425,11 @@ class EMCVMAXCommonData(object):
'volume_type_id': 'sourceid',
'display_name': 'sourceVolume',
'name': 'sourceVolume',
'id': 'sourceVolume',
'device_id': '1',
'volume_name': 'vmax-154326',
'provider_auth': None,
'project_id':
'project', 'id': '2',
'project_id': 'project',
'id': '2',
'host': fake_host_v3,
'provider_location':
six.text_type(provider_location),

1
cinder/tests/unit/test_ibm_xiv_ds8k.py
View File

@ -125,7 +125,6 @@ class XIVDS8KFakeProxyDriver(object):
return {'driver_volume_type': 'iscsi',
'data': {'target_discovered': True,
'target_discovered': True,
'target_portal': self.xiv_ds8k_portal,
'target_iqn': self.xiv_ds8k_iqn,
'target_lun': lun_id,

2
cinder/tests/unit/volume/drivers/test_hgst.py
View File

@ -466,7 +466,7 @@ class HGSTTestCase(test.TestCase):
def test_create_snapshot(self, mock_ghn):
"""Test creating a snapshot, ensure full data of original copied."""
# Now snapshot the volume and check commands
snapshot = {'volume_name': 'volume10', 'volume_size': 10,
snapshot = {'volume_name': 'volume10',
'volume_id': 'xxx', 'display_name': 'snap10',
'name': '123abc', 'volume_size': 10, 'id': '123abc',
'volume': {'provider_id': 'space10'}}