From 826a31f8bcfb870374a11e8d10a018ff0f2e7868 Mon Sep 17 00:00:00 2001 From: zhufl Date: Fri, 20 Nov 2020 09:35:04 +0800 Subject: [PATCH] Remove duplicated keys in dict This is to remove duplicated keys in dict. Change-Id: I58b1e3280d2fbcbe354136170c22acf78642a0b1 --- .../unit/conductor/handlers/test_k8s_cluster_conductor.py | 7 ------- magnum/tests/unit/conductor/test_monitors.py | 2 +- magnum/tests/unit/drivers/test_template_definition.py | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py b/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py index 4c17039b1c..91108c539a 100644 --- a/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py +++ b/magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py @@ -116,7 +116,6 @@ class TestClusterConductorWithK8s(base.TestCase): 'service_cluster_ip_range': '10.254.0.0/16', 'boot_volume_size': '60'}, 'master_flavor_id': 'master_flavor_id', - 'flavor_id': 'flavor_id', 'project_id': 'project_id', 'keystone_auth_default_policy': self.keystone_auth_default_policy, 'fixed_network': 'fixed_network', @@ -370,8 +369,6 @@ class TestClusterConductorWithK8s(base.TestCase): 'portal_network_cidr': '10.254.0.0/16', 'project_id': 'project_id', 'max_node_count': 2, - 'master_image': 'image_id', - 'minion_image': 'image_id', 'keystone_auth_default_policy': self.keystone_auth_default_policy, 'boot_volume_size': '60', 'boot_volume_type': 'lvmdriver-1', @@ -527,8 +524,6 @@ class TestClusterConductorWithK8s(base.TestCase): 'portal_network_cidr': '10.254.0.0/16', 'project_id': 'project_id', 'max_node_count': 2, - 'master_image': 'image_id', - 'minion_image': 'image_id', 'keystone_auth_default_policy': self.keystone_auth_default_policy, 'boot_volume_size': '60', 'boot_volume_type': 'lvmdriver-1', @@ -1148,8 +1143,6 @@ class TestClusterConductorWithK8s(base.TestCase): 'portal_network_cidr': '10.254.0.0/16', 'project_id': 'project_id', 'max_node_count': 2, - 'master_image': 'image_id', - 'minion_image': 'image_id', 'keystone_auth_default_policy': self.keystone_auth_default_policy, 'boot_volume_size': '60', 'boot_volume_type': 'lvmdriver-1', diff --git a/magnum/tests/unit/conductor/test_monitors.py b/magnum/tests/unit/conductor/test_monitors.py index e48552ec7b..cba183fce0 100644 --- a/magnum/tests/unit/conductor/test_monitors.py +++ b/magnum/tests/unit/conductor/test_monitors.py @@ -514,7 +514,7 @@ class MonitorsTestCase(base.TestCase): m_fields.ClusterHealthStatus.UNHEALTHY) self.assertEqual(self.k8s_monitor.data['health_status_reason'], {'api': 'ok', 'k8s-cluster-node-0.Ready': False, - 'api': 'ok', 'k8s-cluster-node-1.Ready': True}) + 'k8s-cluster-node-1.Ready': True}) @mock.patch('magnum.conductor.k8s_api.create_k8s_api') def test_k8s_monitor_health_unreachable_cluster(self, mock_k8s_api): diff --git a/magnum/tests/unit/drivers/test_template_definition.py b/magnum/tests/unit/drivers/test_template_definition.py index 7440bfed9f..5284b1ae25 100644 --- a/magnum/tests/unit/drivers/test_template_definition.py +++ b/magnum/tests/unit/drivers/test_template_definition.py @@ -707,7 +707,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseK8sTemplateDefinitionTestCase): 'kube_version': kube_tag, 'master_kube_tag': kube_tag, 'minion_kube_tag': kube_tag, - 'boot_volume_size': boot_volume_size, 'boot_volume_type': boot_volume_type, 'etcd_volume_type': etcd_volume_type, 'ostree_remote': ostree_remote, @@ -1241,7 +1240,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseK8sTemplateDefinitionTestCase): 'kube_version': kube_tag, 'master_kube_tag': kube_tag, 'minion_kube_tag': kube_tag, - 'boot_volume_size': boot_volume_size, 'boot_volume_type': boot_volume_type, 'etcd_volume_type': etcd_volume_type, 'ostree_remote': ostree_remote,