From a468f8c49b65c753c04771dadd75d28799286392 Mon Sep 17 00:00:00 2001 From: zhufl Date: Tue, 20 Sep 2016 14:52:19 +0800 Subject: [PATCH] Remove unnecessary setUp and tearDown setUp and tearDown will be automatically called around each testcase, so this is to remove setUp and tearDown that doing nothing additional than super to keep code clean. Change-Id: Ie5cd156a297215c07906f89b89486e5f97f9fc98 --- .../unit/api/openstack/compute/test_server_migrations.py | 6 ------ nova/tests/unit/scheduler/filters/test_disk_filters.py | 3 --- nova/tests/unit/scheduler/filters/test_utils.py | 3 --- nova/tests/unit/virt/disk/mount/test_api.py | 3 --- nova/tests/unit/virt/vmwareapi/test_vif.py | 3 --- 5 files changed, 18 deletions(-) diff --git a/nova/tests/unit/api/openstack/compute/test_server_migrations.py b/nova/tests/unit/api/openstack/compute/test_server_migrations.py index cd58fb524f..3b5419cb19 100644 --- a/nova/tests/unit/api/openstack/compute/test_server_migrations.py +++ b/nova/tests/unit/api/openstack/compute/test_server_migrations.py @@ -342,9 +342,6 @@ class ServerMigrationsPolicyEnforcementV223( wsgi_api_version = '2.23' - def setUp(self): - super(ServerMigrationsPolicyEnforcementV223, self).setUp() - def test_migration_index_failed(self): rule_name = "os_compute_api:servers:migrations:index" self.policy.set_rules({rule_name: "project:non_fake"}) @@ -369,9 +366,6 @@ class ServerMigrationsPolicyEnforcementV224( wsgi_api_version = '2.24' - def setUp(self): - super(ServerMigrationsPolicyEnforcementV224, self).setUp() - def test_migrate_delete_failed(self): rule_name = "os_compute_api:servers:migrations:delete" self.policy.set_rules({rule_name: "project:non_fake"}) diff --git a/nova/tests/unit/scheduler/filters/test_disk_filters.py b/nova/tests/unit/scheduler/filters/test_disk_filters.py index 1d5e892eb7..9aa6e2eec5 100644 --- a/nova/tests/unit/scheduler/filters/test_disk_filters.py +++ b/nova/tests/unit/scheduler/filters/test_disk_filters.py @@ -20,9 +20,6 @@ from nova.tests.unit.scheduler import fakes class TestDiskFilter(test.NoDBTestCase): - def setUp(self): - super(TestDiskFilter, self).setUp() - def test_disk_filter_passes(self): filt_cls = disk_filter.DiskFilter() spec_obj = objects.RequestSpec( diff --git a/nova/tests/unit/scheduler/filters/test_utils.py b/nova/tests/unit/scheduler/filters/test_utils.py index 1fc27fbe5c..5f2a2d2dfd 100644 --- a/nova/tests/unit/scheduler/filters/test_utils.py +++ b/nova/tests/unit/scheduler/filters/test_utils.py @@ -42,9 +42,6 @@ _AGGREGATE_FIXTURES = [ class TestUtils(test.NoDBTestCase): - def setUp(self): - super(TestUtils, self).setUp() - def test_aggregate_values_from_key(self): host_state = fakes.FakeHostState( 'fake', 'node', {'aggregates': _AGGREGATE_FIXTURES}) diff --git a/nova/tests/unit/virt/disk/mount/test_api.py b/nova/tests/unit/virt/disk/mount/test_api.py index 0e5b074a7c..de86d41d14 100644 --- a/nova/tests/unit/virt/disk/mount/test_api.py +++ b/nova/tests/unit/virt/disk/mount/test_api.py @@ -29,9 +29,6 @@ MAP_PARTITION = "/dev/mapper/nullp77" class MountTestCase(test.NoDBTestCase): - def setUp(self): - super(MountTestCase, self).setUp() - def _test_map_dev(self, partition): mount = api.Mount(mock.sentinel.image, mock.sentinel.mount_dir) mount.device = ORIG_DEVICE diff --git a/nova/tests/unit/virt/vmwareapi/test_vif.py b/nova/tests/unit/virt/vmwareapi/test_vif.py index 2f6d46769f..aecd9abe64 100644 --- a/nova/tests/unit/virt/vmwareapi/test_vif.py +++ b/nova/tests/unit/virt/vmwareapi/test_vif.py @@ -52,9 +52,6 @@ class VMwareVifTestCase(test.NoDBTestCase): self.session = fake.FakeSession() self.cluster = None - def tearDown(self): - super(VMwareVifTestCase, self).tearDown() - def test_ensure_vlan_bridge(self): self.mox.StubOutWithMock(network_util, 'get_network_with_the_name') self.mox.StubOutWithMock(network_util,