From 58af05447d14083cf4a079540d51aba42dd8bebe Mon Sep 17 00:00:00 2001 From: Ankit Agrawal Date: Wed, 16 Dec 2015 22:32:57 -0800 Subject: [PATCH] Remove duplicate keys from dictionary There are a few places where duplicate keys are defined in the dictionary. Removed all such occurrences throughout the code. TrivialFix Change-Id: I3f22a2ce3bc4d67bfaed2dee7918610b3225e26e --- manila/tests/scheduler/test_host_manager.py | 1 - manila/tests/share/drivers/huawei/test_huawei_nas.py | 1 - manila_tempest_tests/tests/api/admin/test_share_networks.py | 2 -- manila_tempest_tests/tests/api/test_share_networks.py | 2 -- 4 files changed, 6 deletions(-) diff --git a/manila/tests/scheduler/test_host_manager.py b/manila/tests/scheduler/test_host_manager.py index ca8529e7dd..cc06cef7e3 100644 --- a/manila/tests/scheduler/test_host_manager.py +++ b/manila/tests/scheduler/test_host_manager.py @@ -603,7 +603,6 @@ class HostStateTestCase(test.TestCase): 'reserved_percentage': 0, 'dying_disks': 200, 'super_hero_1': 'superman', - 'super_hero_2': ' ', 'super_hero_2': 'Hulk', } ], diff --git a/manila/tests/share/drivers/huawei/test_huawei_nas.py b/manila/tests/share/drivers/huawei/test_huawei_nas.py index e89159b16e..82f1358153 100644 --- a/manila/tests/share/drivers/huawei/test_huawei_nas.py +++ b/manila/tests/share/drivers/huawei/test_huawei_nas.py @@ -458,7 +458,6 @@ class HuaweiShareDriverTestCase(test.TestCase): 'share_proto': 'NFS', 'share_network_id': 'fake_net_id', 'share_server_id': 'fake-share-srv-id', - 'host': 'fake_host@fake_backend#OpenStack_Pool', 'export_locations': [ {'path': '100.115.10.68:/share_fake_uuid'}, ], diff --git a/manila_tempest_tests/tests/api/admin/test_share_networks.py b/manila_tempest_tests/tests/api/admin/test_share_networks.py index c54ab97a7b..cc4dad4b40 100644 --- a/manila_tempest_tests/tests/api/admin/test_share_networks.py +++ b/manila_tempest_tests/tests/api/admin/test_share_networks.py @@ -53,8 +53,6 @@ class ShareNetworkAdminTest( type_of_creds='alt') cls.data_sn_with_kerberos_ss = { 'name': 'sn_with_kerberos_ss', - 'neutron_net_id': '3333', - 'neutron_subnet_id': '4444', 'created_at': '2003-03-03', 'updated_at': None, 'neutron_net_id': 'test net id', diff --git a/manila_tempest_tests/tests/api/test_share_networks.py b/manila_tempest_tests/tests/api/test_share_networks.py index 4dfef3112f..83c4dd5b09 100644 --- a/manila_tempest_tests/tests/api/test_share_networks.py +++ b/manila_tempest_tests/tests/api/test_share_networks.py @@ -117,8 +117,6 @@ class ShareNetworksTest(base.BaseSharesTest, ShareNetworkListMixin): cls.data_sn_with_kerberos_ss = { 'name': 'sn_with_kerberos_ss', - 'neutron_net_id': '3333', - 'neutron_subnet_id': '4444', 'created_at': '2003-03-03', 'updated_at': None, 'neutron_net_id': 'test net id',