From 534e69fa146ae2476e5cd695e92acd409c2ec6dd Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Tue, 16 Dec 2014 20:28:15 +0100 Subject: [PATCH] tests: drop unit tests that only check default configuration values Those tests do not add much value and only introduce burden when a default value should be changed. Change-Id: I32049399b16338996d6bef342c004d5de2446cf1 --- .../unit/embrane/test_embrane_defaults.py | 27 ------------ .../tests/unit/linuxbridge/test_defaults.py | 42 ------------------- neutron/tests/unit/mlnx/test_defaults.py | 32 -------------- .../tests/unit/ofagent/test_ofa_defaults.py | 26 ------------ .../unit/openvswitch/test_ovs_defaults.py | 31 -------------- neutron/tests/unit/test_config.py | 20 +-------- 6 files changed, 1 insertion(+), 177 deletions(-) delete mode 100644 neutron/tests/unit/embrane/test_embrane_defaults.py delete mode 100644 neutron/tests/unit/linuxbridge/test_defaults.py delete mode 100644 neutron/tests/unit/mlnx/test_defaults.py delete mode 100644 neutron/tests/unit/ofagent/test_ofa_defaults.py delete mode 100644 neutron/tests/unit/openvswitch/test_ovs_defaults.py diff --git a/neutron/tests/unit/embrane/test_embrane_defaults.py b/neutron/tests/unit/embrane/test_embrane_defaults.py deleted file mode 100644 index 3f37e7c41..000000000 --- a/neutron/tests/unit/embrane/test_embrane_defaults.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2013 Embrane, Inc. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo.config import cfg - -from neutron.plugins.embrane.common import config # noqa -from neutron.tests import base - - -class ConfigurationTest(base.BaseTestCase): - - def test_defaults(self): - self.assertEqual('admin', cfg.CONF.heleos.admin_username) - self.assertEqual('default', cfg.CONF.heleos.resource_pool_id) - self.assertTrue(cfg.CONF.heleos.async_requests) diff --git a/neutron/tests/unit/linuxbridge/test_defaults.py b/neutron/tests/unit/linuxbridge/test_defaults.py deleted file mode 100644 index 1c395e81d..000000000 --- a/neutron/tests/unit/linuxbridge/test_defaults.py +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (c) 2012 OpenStack Foundation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from oslo.config import cfg - -from neutron.plugins.linuxbridge.common import config # noqa -from neutron.tests import base - - -class ConfigurationTest(base.BaseTestCase): - - def test_defaults(self): - self.assertEqual(2, - cfg.CONF.AGENT.polling_interval) - self.assertEqual(False, - cfg.CONF.AGENT.rpc_support_old_agents) - self.assertEqual('sudo', - cfg.CONF.AGENT.root_helper) - self.assertEqual('local', - cfg.CONF.VLANS.tenant_network_type) - self.assertEqual(0, - len(cfg.CONF.VLANS.network_vlan_ranges)) - self.assertEqual(0, - len(cfg.CONF.LINUX_BRIDGE. - physical_interface_mappings)) - self.assertEqual(False, cfg.CONF.VXLAN.enable_vxlan) - self.assertEqual(config.DEFAULT_VXLAN_GROUP, - cfg.CONF.VXLAN.vxlan_group) - self.assertEqual(0, len(cfg.CONF.VXLAN.local_ip)) - self.assertEqual(False, cfg.CONF.VXLAN.l2_population) diff --git a/neutron/tests/unit/mlnx/test_defaults.py b/neutron/tests/unit/mlnx/test_defaults.py deleted file mode 100644 index 58b30b8d8..000000000 --- a/neutron/tests/unit/mlnx/test_defaults.py +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2013 OpenStack Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from oslo.config import cfg - -#NOTE this import loads tests required options -from neutron.plugins.mlnx.common import config # noqa -from neutron.tests import base - - -class ConfigurationTest(base.BaseTestCase): - - def test_defaults(self): - self.assertEqual(2, - cfg.CONF.AGENT.polling_interval) - self.assertEqual(0, - len(cfg.CONF.ESWITCH. - physical_interface_mappings)) - self.assertEqual('tcp://127.0.0.1:60001', - cfg.CONF.ESWITCH.daemon_endpoint) diff --git a/neutron/tests/unit/ofagent/test_ofa_defaults.py b/neutron/tests/unit/ofagent/test_ofa_defaults.py deleted file mode 100644 index 51c2cb468..000000000 --- a/neutron/tests/unit/ofagent/test_ofa_defaults.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2014 VA Linux Systems Japan K.K. -# Copyright (C) 2014 Fumihiko Kakuma -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo.config import cfg - -from neutron.plugins.ofagent.common import config # noqa -from neutron.tests import base - - -class ConfigurationTest(base.BaseTestCase): - """Configuration file Tests.""" - def test_ml2_defaults(self): - self.assertEqual(60, cfg.CONF.AGENT.get_datapath_retry_times) diff --git a/neutron/tests/unit/openvswitch/test_ovs_defaults.py b/neutron/tests/unit/openvswitch/test_ovs_defaults.py deleted file mode 100644 index 7436cc761..000000000 --- a/neutron/tests/unit/openvswitch/test_ovs_defaults.py +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2012 OpenStack Foundation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from oslo.config import cfg - -from neutron.plugins.openvswitch.common import config # noqa -from neutron.tests import base - - -class ConfigurationTest(base.BaseTestCase): - - def test_defaults(self): - self.assertEqual('br-int', cfg.CONF.OVS.integration_bridge) - self.assertEqual('br-tun', cfg.CONF.OVS.tunnel_bridge) - self.assertEqual(2, cfg.CONF.AGENT.polling_interval) - self.assertEqual('sudo', cfg.CONF.AGENT.root_helper) - self.assertEqual(0, len(cfg.CONF.OVS.bridge_mappings)) - self.assertFalse(cfg.CONF.AGENT.l2_population) - self.assertFalse(cfg.CONF.AGENT.arp_responder) diff --git a/neutron/tests/unit/test_config.py b/neutron/tests/unit/test_config.py index 63d36a70c..f09edacc8 100644 --- a/neutron/tests/unit/test_config.py +++ b/neutron/tests/unit/test_config.py @@ -16,7 +16,7 @@ import mock from oslo.config import cfg -from neutron.common import config # noqa +from neutron.common import config from neutron.tests import base @@ -26,24 +26,6 @@ class ConfigurationTest(base.BaseTestCase): # don't use default config pass - def test_defaults(self): - self.assertEqual('0.0.0.0', cfg.CONF.bind_host) - self.assertEqual(9696, cfg.CONF.bind_port) - self.assertEqual('api-paste.ini', cfg.CONF.api_paste_config) - self.assertEqual('', cfg.CONF.api_extensions_path) - self.assertEqual('policy.json', cfg.CONF.policy_file) - self.assertEqual('keystone', cfg.CONF.auth_strategy) - self.assertIsNone(cfg.CONF.core_plugin) - self.assertEqual(0, len(cfg.CONF.service_plugins)) - self.assertEqual('fa:16:3e:00:00:00', cfg.CONF.base_mac) - self.assertEqual(16, cfg.CONF.mac_generation_retries) - self.assertTrue(cfg.CONF.allow_bulk) - self.assertEqual(5, cfg.CONF.max_dns_nameservers) - self.assertEqual(20, cfg.CONF.max_subnet_host_routes) - self.assertEqual(86400, cfg.CONF.dhcp_lease_duration) - self.assertFalse(cfg.CONF.allow_overlapping_ips) - self.assertEqual('neutron', cfg.CONF.control_exchange) - def test_load_paste_app_not_found(self): self.config(api_paste_config='no_such_file.conf') with mock.patch.object(cfg.CONF, 'find_file', return_value=None) as ff: -- 2.45.2