From 596c972d99afff6d44eddfc53e07997583c49f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Antal?= Date: Thu, 24 Aug 2017 14:46:30 +0200 Subject: [PATCH] Removed unnecessary tearDown() methods TrivialFix Change-Id: Id8ae6fea8321186ac94a0673f759f283e4437a31 --- cinder/tests/unit/volume/drivers/dell_emc/vnx/test_adapter.py | 3 --- .../tests/unit/volume/drivers/dell_emc/vnx/test_replication.py | 3 --- .../tests/unit/volume/drivers/synology/test_synology_common.py | 3 --- cinder/tests/unit/volume/drivers/test_nimble.py | 3 --- cinder/tests/unit/volume/drivers/test_pure.py | 3 --- cinder/tests/unit/volume/drivers/test_zfssa.py | 3 --- 6 files changed, 18 deletions(-) diff --git a/cinder/tests/unit/volume/drivers/dell_emc/vnx/test_adapter.py b/cinder/tests/unit/volume/drivers/dell_emc/vnx/test_adapter.py index f69b9b4db24..e475514fbef 100644 --- a/cinder/tests/unit/volume/drivers/dell_emc/vnx/test_adapter.py +++ b/cinder/tests/unit/volume/drivers/dell_emc/vnx/test_adapter.py @@ -48,9 +48,6 @@ class TestCommonAdapter(test.TestCase): self.configuration.config_group = 'vnx_backend' self.ctxt = context.get_admin_context() - def tearDown(self): - super(TestCommonAdapter, self).tearDown() - @res_mock.mock_driver_input @res_mock.patch_common_adapter def test_create_volume(self, vnx_common, _ignore, mocked_input): diff --git a/cinder/tests/unit/volume/drivers/dell_emc/vnx/test_replication.py b/cinder/tests/unit/volume/drivers/dell_emc/vnx/test_replication.py index 4995c1cc2a0..fec9728e50f 100644 --- a/cinder/tests/unit/volume/drivers/dell_emc/vnx/test_replication.py +++ b/cinder/tests/unit/volume/drivers/dell_emc/vnx/test_replication.py @@ -34,9 +34,6 @@ class TestReplicationAdapter(test.TestCase): self.configuration.storage_vnx_authentication_type = 'global' self.ctxt = context.get_admin_context() - def tearDown(self): - super(TestReplicationAdapter, self).tearDown() - @utils.patch_group_specs({ 'consistent_group_replication_enabled': ' True'}) @res_mock.mock_driver_input diff --git a/cinder/tests/unit/volume/drivers/synology/test_synology_common.py b/cinder/tests/unit/volume/drivers/synology/test_synology_common.py index e81703b8929..2daecad14bb 100644 --- a/cinder/tests/unit/volume/drivers/synology/test_synology_common.py +++ b/cinder/tests/unit/volume/drivers/synology/test_synology_common.py @@ -234,9 +234,6 @@ class SynoAPIRequestTestCase(test.TestCase): self.request._APIRequest__session._sid = 'sid' self.request._APIRequest__session.__class__.__del__ = lambda x: x - def tearDown(self): - super(SynoAPIRequestTestCase, self).tearDown() - @mock.patch.object(common, 'Session') def test_new_session(self, _mock_session): self.device_id = 'did' diff --git a/cinder/tests/unit/volume/drivers/test_nimble.py b/cinder/tests/unit/volume/drivers/test_nimble.py index 2ad1eafc985..77f85d86bf8 100644 --- a/cinder/tests/unit/volume/drivers/test_nimble.py +++ b/cinder/tests/unit/volume/drivers/test_nimble.py @@ -247,9 +247,6 @@ class NimbleDriverBaseTestCase(test.TestCase): return inner_clent_mock return client_mock_wrapper - def tearDown(self): - super(NimbleDriverBaseTestCase, self).tearDown() - class NimbleDriverLoginTestCase(NimbleDriverBaseTestCase): diff --git a/cinder/tests/unit/volume/drivers/test_pure.py b/cinder/tests/unit/volume/drivers/test_pure.py index 0e7473aada8..09fd6192968 100644 --- a/cinder/tests/unit/volume/drivers/test_pure.py +++ b/cinder/tests/unit/volume/drivers/test_pure.py @@ -514,9 +514,6 @@ class PureBaseSharedDriverTestCase(PureDriverTestCase): self.purestorage_module.FlashArray.side_effect = None self.array2.get_rest_version.return_value = '1.4' - def tearDown(self): - super(PureBaseSharedDriverTestCase, self).tearDown() - @ddt.ddt class PureBaseVolumeDriverTestCase(PureBaseSharedDriverTestCase): diff --git a/cinder/tests/unit/volume/drivers/test_zfssa.py b/cinder/tests/unit/volume/drivers/test_zfssa.py index 4fe70c8b93a..915a63dfb75 100644 --- a/cinder/tests/unit/volume/drivers/test_zfssa.py +++ b/cinder/tests/unit/volume/drivers/test_zfssa.py @@ -1204,9 +1204,6 @@ class TestZFSSANFSDriver(test.TestCase): stats = self.drv.get_volume_stats(refresh=True) self.assertEqual('mirror3', stats['zfssa_poolprofile']) - def tearDown(self): - super(TestZFSSANFSDriver, self).tearDown() - @mock.patch.object(nfsdriver.NfsDriver, 'delete_volume') @mock.patch.object(zfssanfs.ZFSSANFSDriver, '_check_origin') def test_delete_volume(self, _check_origin, _delete_vol):