From 789acb3a7e17111077aaa4fa735ac4145ae7e399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Antal?= Date: Mon, 31 Jul 2017 17:13:34 +0200 Subject: [PATCH] Removed unnecessary setUp calls in tests There are several places where base class setUp() method call was called unnecessary. In this patchset, they are removed. TrivialFix Change-Id: I2961fa4a0216f7f1223ab87a249151f0feb91518 --- .../tests/unit/agent/l3/test_fip_rule_priority_allocator.py | 3 --- neutron/tests/unit/agent/l3/test_ha_router.py | 2 -- neutron/tests/unit/agent/l3/test_item_allocator.py | 2 -- neutron/tests/unit/agent/l3/test_router_processing_queue.py | 2 -- neutron/tests/unit/agent/linux/test_interface.py | 3 --- neutron/tests/unit/agent/linux/test_iptables_firewall.py | 3 --- neutron/tests/unit/api/rpc/callbacks/consumer/test_registry.py | 3 --- neutron/tests/unit/extensions/test_timestamp.py | 3 --- neutron/tests/unit/ipam/test_requests.py | 3 --- 9 files changed, 24 deletions(-) diff --git a/neutron/tests/unit/agent/l3/test_fip_rule_priority_allocator.py b/neutron/tests/unit/agent/l3/test_fip_rule_priority_allocator.py index b7d606d5865..70223a3c8ca 100644 --- a/neutron/tests/unit/agent/l3/test_fip_rule_priority_allocator.py +++ b/neutron/tests/unit/agent/l3/test_fip_rule_priority_allocator.py @@ -17,9 +17,6 @@ from neutron.tests import base class TestFipPriority(base.BaseTestCase): - def setUp(self): - super(TestFipPriority, self).setUp() - def test__init__(self): test_pr = frpa.FipPriority(10) self.assertEqual(10, test_pr.index) diff --git a/neutron/tests/unit/agent/l3/test_ha_router.py b/neutron/tests/unit/agent/l3/test_ha_router.py index 3f056975097..1fca47d033f 100644 --- a/neutron/tests/unit/agent/l3/test_ha_router.py +++ b/neutron/tests/unit/agent/l3/test_ha_router.py @@ -25,8 +25,6 @@ _uuid = uuidutils.generate_uuid class TestBasicRouterOperations(base.BaseTestCase): - def setUp(self): - super(TestBasicRouterOperations, self).setUp() def _create_router(self, router=None, **kwargs): if not router: diff --git a/neutron/tests/unit/agent/l3/test_item_allocator.py b/neutron/tests/unit/agent/l3/test_item_allocator.py index 9a843d26fb8..a614459ebac 100644 --- a/neutron/tests/unit/agent/l3/test_item_allocator.py +++ b/neutron/tests/unit/agent/l3/test_item_allocator.py @@ -28,8 +28,6 @@ class TestObject(object): class TestItemAllocator(base.BaseTestCase): - def setUp(self): - super(TestItemAllocator, self).setUp() def test__init__(self): test_pool = set(TestObject(s) for s in range(32768, 40000)) diff --git a/neutron/tests/unit/agent/l3/test_router_processing_queue.py b/neutron/tests/unit/agent/l3/test_router_processing_queue.py index 8f8db193689..af7cf07e6cb 100644 --- a/neutron/tests/unit/agent/l3/test_router_processing_queue.py +++ b/neutron/tests/unit/agent/l3/test_router_processing_queue.py @@ -26,8 +26,6 @@ FAKE_ID_2 = _uuid() class TestExclusiveRouterProcessor(base.BaseTestCase): - def setUp(self): - super(TestExclusiveRouterProcessor, self).setUp() def test_i_am_master(self): master = l3_queue.ExclusiveRouterProcessor(FAKE_ID) diff --git a/neutron/tests/unit/agent/linux/test_interface.py b/neutron/tests/unit/agent/linux/test_interface.py index 057151f097b..1de8df6b554 100644 --- a/neutron/tests/unit/agent/linux/test_interface.py +++ b/neutron/tests/unit/agent/linux/test_interface.py @@ -595,9 +595,6 @@ class TestBridgeInterfaceDriver(TestBase): class TestIVSInterfaceDriver(TestBase): - def setUp(self): - super(TestIVSInterfaceDriver, self).setUp() - def test_get_device_name(self): br = interface.IVSInterfaceDriver(self.conf) device_name = br.get_device_name(FakePort()) diff --git a/neutron/tests/unit/agent/linux/test_iptables_firewall.py b/neutron/tests/unit/agent/linux/test_iptables_firewall.py index b5d150a1701..acb6666126c 100644 --- a/neutron/tests/unit/agent/linux/test_iptables_firewall.py +++ b/neutron/tests/unit/agent/linux/test_iptables_firewall.py @@ -2091,9 +2091,6 @@ class IptablesFirewallEnhancedIpsetTestCase(BaseIptablesFirewallTestCase): class OVSHybridIptablesFirewallTestCase(BaseIptablesFirewallTestCase): - def setUp(self): - super(OVSHybridIptablesFirewallTestCase, self).setUp() - def test__populate_initial_zone_map(self): self.assertEqual(self._dev_zone_map, self.firewall.ipconntrack._device_zone_map) diff --git a/neutron/tests/unit/api/rpc/callbacks/consumer/test_registry.py b/neutron/tests/unit/api/rpc/callbacks/consumer/test_registry.py index 169df3aaae3..b1d0ccc0d1f 100644 --- a/neutron/tests/unit/api/rpc/callbacks/consumer/test_registry.py +++ b/neutron/tests/unit/api/rpc/callbacks/consumer/test_registry.py @@ -18,9 +18,6 @@ from neutron.tests import base class ConsumerRegistryTestCase(base.BaseTestCase): - def setUp(self): - super(ConsumerRegistryTestCase, self).setUp() - def test__get_manager_is_singleton(self): self.assertIs(registry._get_manager(), registry._get_manager()) diff --git a/neutron/tests/unit/extensions/test_timestamp.py b/neutron/tests/unit/extensions/test_timestamp.py index 97b3b3054cc..cb784e619bd 100644 --- a/neutron/tests/unit/extensions/test_timestamp.py +++ b/neutron/tests/unit/extensions/test_timestamp.py @@ -240,9 +240,6 @@ class TimeStampChangedsinceTestCase(test_db_base_plugin_v2. class TimeStampDBMixinTestCase(TimeStampChangedsinceTestCase): """Test timestamp_db.TimeStamp_db_mixin()""" - def setUp(self): - super(TimeStampDBMixinTestCase, self).setUp() - def _save_network(self, network_id): ctx = context.get_admin_context() with ctx.session.begin(subtransactions=True): diff --git a/neutron/tests/unit/ipam/test_requests.py b/neutron/tests/unit/ipam/test_requests.py index e283bb8179d..16fd662c284 100644 --- a/neutron/tests/unit/ipam/test_requests.py +++ b/neutron/tests/unit/ipam/test_requests.py @@ -187,9 +187,6 @@ class TestAddressRequest(base.BaseTestCase): EUI64 = ipam_req.AutomaticAddressRequest.EUI64 - def setUp(self): - super(TestAddressRequest, self).setUp() - def test_specific_address_ipv6(self): request = ipam_req.SpecificAddressRequest('2000::45') self.assertEqual(netaddr.IPAddress('2000::45'), request.address)