From 5c39464c50b39ca9545f46a48564e1b495fd2c45 Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date: Fri, 2 Mar 2012 00:08:25 +0000
Subject: Remove empty setUp/tearDown methods

Python will call into the parent classes implementation of setUp/tearDown
if there is no implementation in the child

Also, make sure all setUp implementations subclassed off test.TestClass
call the parent setUp so everything gets setup correctly

Change-Id: If410cd412d9557a0d3172ec96b592fbd3fd67ffd
---
 .../api/openstack/compute/contrib/test_createserverext.py      |  7 -------
 nova/tests/api/openstack/compute/contrib/test_flavor_manage.py |  3 ---
 .../api/openstack/compute/contrib/test_security_groups.py      |  6 ------
 .../api/openstack/compute/contrib/test_server_start_stop.py    |  3 ---
 .../api/openstack/compute/contrib/test_virtual_interfaces.py   |  3 ---
 nova/tests/api/openstack/compute/contrib/test_volumes.py       |  3 ---
 nova/tests/api/openstack/compute/contrib/test_vsa.py           |  6 ------
 nova/tests/api/openstack/compute/test_limits.py                |  5 +----
 nova/tests/api/openstack/compute/test_server_actions.py        |  4 +---
 nova/tests/api/openstack/volume/test_volumes.py                |  3 ---
 nova/tests/api/test_auth.py                                    |  4 +---
 nova/tests/rpc/test_carrot.py                                  |  3 ---
 nova/tests/rpc/test_fake.py                                    |  3 ---
 nova/tests/rpc/test_kombu_ssl.py                               |  2 +-
 nova/tests/scheduler/test_host_manager.py                      |  3 ---
 nova/tests/scheduler/test_least_cost.py                        | 10 ----------
 nova/tests/test_SolidFireSanISCSIDriver.py                     |  3 ---
 nova/tests/test_bdm.py                                         |  6 ------
 nova/tests/test_compute.py                                     |  6 ------
 nova/tests/test_consoleauth.py                                 |  3 ---
 nova/tests/test_db_api.py                                      |  3 ---
 nova/tests/test_nova_rootwrap.py                               |  3 ---
 nova/tests/test_signer.py                                      |  3 ---
 nova/tests/test_xenapi.py                                      |  3 ---
 24 files changed, 4 insertions(+), 94 deletions(-)

diff --git a/nova/tests/api/openstack/compute/contrib/test_createserverext.py b/nova/tests/api/openstack/compute/contrib/test_createserverext.py
index e78f8cfd1..382d26e69 100644
--- a/nova/tests/api/openstack/compute/contrib/test_createserverext.py
+++ b/nova/tests/api/openstack/compute/contrib/test_createserverext.py
@@ -61,13 +61,6 @@ def return_instance_add_security_group(context, instance_id,
 
 
 class CreateserverextTest(test.TestCase):
-
-    def setUp(self):
-        super(CreateserverextTest, self).setUp()
-
-    def tearDown(self):
-        super(CreateserverextTest, self).tearDown()
-
     def _make_stub_method(self, canned_return):
         def stub_method(*args, **kwargs):
             return canned_return
diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py b/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py
index 8a18c1ab2..0639d99cc 100644
--- a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py
+++ b/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py
@@ -80,9 +80,6 @@ class FlavorManageTest(test.TestCase):
 
         self.controller = flavormanage.FlavorManageController()
 
-    def tearDown(self):
-        super(FlavorManageTest, self).tearDown()
-
     def test_delete(self):
         req = fakes.HTTPRequest.blank('/v2/123/flavors/1234')
         res = self.controller._delete(req, 1234)
diff --git a/nova/tests/api/openstack/compute/contrib/test_security_groups.py b/nova/tests/api/openstack/compute/contrib/test_security_groups.py
index a64ec7b6f..782eb409b 100644
--- a/nova/tests/api/openstack/compute/contrib/test_security_groups.py
+++ b/nova/tests/api/openstack/compute/contrib/test_security_groups.py
@@ -115,9 +115,6 @@ class TestSecurityGroups(test.TestCase):
             security_groups.ServerSecurityGroupController())
         self.manager = security_groups.SecurityGroupActionController()
 
-    def tearDown(self):
-        super(TestSecurityGroups, self).tearDown()
-
     def test_create_security_group(self):
         sg = security_group_template()
 
@@ -557,9 +554,6 @@ class TestSecurityGroupRules(test.TestCase):
 
         self.controller = security_groups.SecurityGroupRulesController()
 
-    def tearDown(self):
-        super(TestSecurityGroupRules, self).tearDown()
-
     def test_create_by_cidr(self):
         rule = security_group_rule_template(cidr='10.2.3.124/24')
 
diff --git a/nova/tests/api/openstack/compute/contrib/test_server_start_stop.py b/nova/tests/api/openstack/compute/contrib/test_server_start_stop.py
index a196d6520..ba8930356 100644
--- a/nova/tests/api/openstack/compute/contrib/test_server_start_stop.py
+++ b/nova/tests/api/openstack/compute/contrib/test_server_start_stop.py
@@ -33,9 +33,6 @@ class ServerStartStopTest(test.TestCase):
         super(ServerStartStopTest, self).setUp()
         self.controller = server_start_stop.ServerStartStopActionController()
 
-    def tearDown(self):
-        super(ServerStartStopTest, self).tearDown()
-
     def test_start(self):
         self.stubs.Set(compute.API, 'get', fake_compute_api_get)
         self.mox.StubOutWithMock(compute.API, 'start')
diff --git a/nova/tests/api/openstack/compute/contrib/test_virtual_interfaces.py b/nova/tests/api/openstack/compute/contrib/test_virtual_interfaces.py
index a5a76f98e..16f946bfc 100644
--- a/nova/tests/api/openstack/compute/contrib/test_virtual_interfaces.py
+++ b/nova/tests/api/openstack/compute/contrib/test_virtual_interfaces.py
@@ -49,9 +49,6 @@ class ServerVirtualInterfaceTest(test.TestCase):
         self.stubs.Set(network.api.API, "get_vifs_by_instance",
                        get_vifs_by_instance)
 
-    def tearDown(self):
-        super(ServerVirtualInterfaceTest, self).tearDown()
-
     def test_get_virtual_interfaces_list(self):
         url = '/v2/fake/servers/abcd/os-virtual-interfaces'
         req = webob.Request.blank(url)
diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/api/openstack/compute/contrib/test_volumes.py
index 7a29cff36..14af207a7 100644
--- a/nova/tests/api/openstack/compute/contrib/test_volumes.py
+++ b/nova/tests/api/openstack/compute/contrib/test_volumes.py
@@ -115,9 +115,6 @@ class VolumeApiTest(test.TestCase):
         self.context = context.get_admin_context()
         self.test_obj = test_obj if test_obj else "volume"
 
-    def tearDown(self):
-        super(VolumeApiTest, self).tearDown()
-
     def test_volume_create(self):
         self.stubs.Set(volume.api.API, "create", fakes.stub_volume_create)
 
diff --git a/nova/tests/api/openstack/compute/contrib/test_vsa.py b/nova/tests/api/openstack/compute/contrib/test_vsa.py
index c04a3636d..049977d42 100644
--- a/nova/tests/api/openstack/compute/contrib/test_vsa.py
+++ b/nova/tests/api/openstack/compute/contrib/test_vsa.py
@@ -104,9 +104,6 @@ class VSAApiTest(test.TestCase):
         self.stubs.Set(vsa.api.API, "get", stub_vsa_get)
         self.stubs.Set(vsa.api.API, "get_all", stub_vsa_get_all)
 
-    def tearDown(self):
-        super(VSAApiTest, self).tearDown()
-
     def test_vsa_create(self):
         global last_param
         last_param = {}
@@ -253,9 +250,6 @@ class VSAVolumeApiTest(test.TestCase):
         self.test_obj = test_obj if test_obj else "volume"
         self.test_objs = test_objs if test_objs else "volumes"
 
-    def tearDown(self):
-        super(VSAVolumeApiTest, self).tearDown()
-
     def test_vsa_volume_create(self):
         self.stubs.Set(volume.api.API, "create", fakes.stub_volume_create)
 
diff --git a/nova/tests/api/openstack/compute/test_limits.py b/nova/tests/api/openstack/compute/test_limits.py
index 0dfd4d387..a743903df 100644
--- a/nova/tests/api/openstack/compute/test_limits.py
+++ b/nova/tests/api/openstack/compute/test_limits.py
@@ -788,6 +788,7 @@ class WsgiLimiterProxyTest(BaseLimitTestSuite):
 class LimitsViewBuilderTest(test.TestCase):
 
     def setUp(self):
+        super(LimitsViewBuilderTest, self).setUp()
         self.view_builder = views.limits.ViewBuilder()
         self.rate_limits = [{"URI": "*",
                              "regex": ".*",
@@ -807,9 +808,6 @@ class LimitsViewBuilderTest(test.TestCase):
                                 "injected_files": 5,
                                 "injected_file_content_bytes": 5}
 
-    def tearDown(self):
-        pass
-
     def test_build_limits(self):
         expected_limits = {"limits": {
                 "rate": [{
@@ -847,7 +845,6 @@ class LimitsViewBuilderTest(test.TestCase):
 
 
 class LimitsXMLSerializationTest(test.TestCase):
-
     def test_xml_declaration(self):
         serializer = limits.LimitsTemplate()
 
diff --git a/nova/tests/api/openstack/compute/test_server_actions.py b/nova/tests/api/openstack/compute/test_server_actions.py
index f37020619..30c3d8cff 100644
--- a/nova/tests/api/openstack/compute/test_server_actions.py
+++ b/nova/tests/api/openstack/compute/test_server_actions.py
@@ -658,11 +658,9 @@ class ServerActionsControllerTest(test.TestCase):
 class TestServerActionXMLDeserializer(test.TestCase):
 
     def setUp(self):
+        super(TestServerActionXMLDeserializer, self).setUp()
         self.deserializer = servers.ActionDeserializer()
 
-    def tearDown(self):
-        pass
-
     def test_create_image(self):
         serial_request = """
 <createImage xmlns="http://docs.openstack.org/compute/api/v1.1"
diff --git a/nova/tests/api/openstack/volume/test_volumes.py b/nova/tests/api/openstack/volume/test_volumes.py
index f0a21e074..c451dde3b 100644
--- a/nova/tests/api/openstack/volume/test_volumes.py
+++ b/nova/tests/api/openstack/volume/test_volumes.py
@@ -37,9 +37,6 @@ class VolumeApiTest(test.TestCase):
         self.stubs.Set(volume_api.API, 'get', fakes.stub_volume_get)
         self.stubs.Set(volume_api.API, 'delete', fakes.stub_volume_delete)
 
-    def tearDown(self):
-        super(VolumeApiTest, self).tearDown()
-
     def test_volume_create(self):
         self.stubs.Set(volume_api.API, "create", fakes.stub_volume_create)
 
diff --git a/nova/tests/api/test_auth.py b/nova/tests/api/test_auth.py
index 0625957f7..10d2cecbf 100644
--- a/nova/tests/api/test_auth.py
+++ b/nova/tests/api/test_auth.py
@@ -21,6 +21,7 @@ from nova import test
 class TestNovaKeystoneContextMiddleware(test.TestCase):
 
     def setUp(self):
+        super(TestNovaKeystoneContextMiddleware, self).setUp()
 
         @webob.dec.wsgify()
         def fake_app(req):
@@ -33,9 +34,6 @@ class TestNovaKeystoneContextMiddleware(test.TestCase):
         self.request.headers['X_TENANT_ID'] = 'testtenantid'
         self.request.headers['X_AUTH_TOKEN'] = 'testauthtoken'
 
-    def tearDown(self):
-        pass
-
     def test_no_user_or_user_id(self):
         response = self.request.get_response(self.middleware)
         self.assertEqual(response.status, '401 Unauthorized')
diff --git a/nova/tests/rpc/test_carrot.py b/nova/tests/rpc/test_carrot.py
index 653b4908a..239863048 100644
--- a/nova/tests/rpc/test_carrot.py
+++ b/nova/tests/rpc/test_carrot.py
@@ -32,9 +32,6 @@ class RpcCarrotTestCase(common._BaseRpcTestCase):
         self.rpc = impl_carrot
         super(RpcCarrotTestCase, self).setUp(supports_timeouts=False)
 
-    def tearDown(self):
-        super(RpcCarrotTestCase, self).tearDown()
-
     def test_connectionpool_single(self):
         """Test that ConnectionPool recycles a single connection."""
         conn1 = self.rpc.ConnectionPool.get()
diff --git a/nova/tests/rpc/test_fake.py b/nova/tests/rpc/test_fake.py
index 5b8d32d0c..72333c139 100644
--- a/nova/tests/rpc/test_fake.py
+++ b/nova/tests/rpc/test_fake.py
@@ -31,6 +31,3 @@ class RpcFakeTestCase(common._BaseRpcTestCase):
     def setUp(self):
         self.rpc = impl_fake
         super(RpcFakeTestCase, self).setUp()
-
-    def tearDown(self):
-        super(RpcFakeTestCase, self).tearDown()
diff --git a/nova/tests/rpc/test_kombu_ssl.py b/nova/tests/rpc/test_kombu_ssl.py
index 246968b1a..2a10835cc 100644
--- a/nova/tests/rpc/test_kombu_ssl.py
+++ b/nova/tests/rpc/test_kombu_ssl.py
@@ -32,7 +32,7 @@ SSL_KEYFILE = "/tmp/keyfile.blah.blah"
 class RpcKombuSslTestCase(test.TestCase):
 
     def setUp(self):
-        test.TestCase.setUp(self)
+        super(RpcKombuSslTestCase, self).setUp()
         self.flags(kombu_ssl_keyfile=SSL_KEYFILE,
                    kombu_ssl_ca_certs=SSL_CA_CERT,
                    kombu_ssl_certfile=SSL_CERT,
diff --git a/nova/tests/scheduler/test_host_manager.py b/nova/tests/scheduler/test_host_manager.py
index dcd2bce25..5e4be3cbc 100644
--- a/nova/tests/scheduler/test_host_manager.py
+++ b/nova/tests/scheduler/test_host_manager.py
@@ -279,9 +279,6 @@ class HostManagerTestCase(test.TestCase):
 class HostStateTestCase(test.TestCase):
     """Test case for HostState class"""
 
-    def setUp(self):
-        super(HostStateTestCase, self).setUp()
-
     # update_from_compute_node() and consume_from_instance() are tested
     # in HostManagerTestCase.test_get_all_host_states()
 
diff --git a/nova/tests/scheduler/test_least_cost.py b/nova/tests/scheduler/test_least_cost.py
index 7c09e4e69..df4e13244 100644
--- a/nova/tests/scheduler/test_least_cost.py
+++ b/nova/tests/scheduler/test_least_cost.py
@@ -36,9 +36,6 @@ class LeastCostTestCase(test.TestCase):
         self.flags(reserved_host_disk_mb=0, reserved_host_memory_mb=0)
         self.host_manager = fakes.FakeHostManager()
 
-    def tearDown(self):
-        super(LeastCostTestCase, self).tearDown()
-
     def _get_all_hosts(self):
         ctxt = context.get_admin_context()
         fakes.mox_host_manager_db_calls(self.mox, ctxt)
@@ -93,13 +90,6 @@ class LeastCostTestCase(test.TestCase):
 
 
 class TestWeightedHost(test.TestCase):
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
     def test_dict_conversion_without_host_state(self):
         host = least_cost.WeightedHost('someweight')
         expected = {'weight': 'someweight'}
diff --git a/nova/tests/test_SolidFireSanISCSIDriver.py b/nova/tests/test_SolidFireSanISCSIDriver.py
index 1814e09a6..a856172b2 100644
--- a/nova/tests/test_SolidFireSanISCSIDriver.py
+++ b/nova/tests/test_SolidFireSanISCSIDriver.py
@@ -27,9 +27,6 @@ class SolidFireVolumeTestCase(test.TestCase):
     def setUp(self):
         super(SolidFireVolumeTestCase, self).setUp()
 
-    def tearDown(self):
-        pass
-
     def fake_issue_api_request(obj, method, params):
         if method is 'GetClusterInfo':
             LOG.info('Called Fake GetClusterInfo...')
diff --git a/nova/tests/test_bdm.py b/nova/tests/test_bdm.py
index b258f6a75..eec412d21 100644
--- a/nova/tests/test_bdm.py
+++ b/nova/tests/test_bdm.py
@@ -26,12 +26,6 @@ from nova import test
 class BlockDeviceMappingEc2CloudTestCase(test.TestCase):
     """Test Case for Block Device Mapping"""
 
-    def setUp(self):
-        super(BlockDeviceMappingEc2CloudTestCase, self).setUp()
-
-    def tearDown(self):
-        super(BlockDeviceMappingEc2CloudTestCase, self).tearDown()
-
     def _assertApply(self, action, bdm_list):
         for bdm, expected_result in bdm_list:
             self.assertDictMatch(action(bdm), expected_result)
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 66142070b..69ba48ac2 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -3297,9 +3297,6 @@ class ComputeAPIAggrTestCase(test.TestCase):
         self.stubs.Set(rpc, 'call', fake_rpc_method)
         self.stubs.Set(rpc, 'cast', fake_rpc_method)
 
-    def tearDown(self):
-        super(ComputeAPIAggrTestCase, self).tearDown()
-
     def test_create_invalid_availability_zone(self):
         """Ensure InvalidAggregateAction is raised with wrong avail_zone."""
         self.assertRaises(exception.InvalidAggregateAction,
@@ -3515,9 +3512,6 @@ class ComputeAggrTestCase(BaseTestCase):
                   'availability_zone': 'test_zone', }
         self.aggr = db.aggregate_create(self.context, values)
 
-    def tearDown(self):
-        super(ComputeAggrTestCase, self).tearDown()
-
     def test_add_aggregate_host(self):
         def fake_driver_add_to_aggregate(context, aggregate, host):
             fake_driver_add_to_aggregate.called = True
diff --git a/nova/tests/test_consoleauth.py b/nova/tests/test_consoleauth.py
index cf74eef18..6370a4ff4 100644
--- a/nova/tests/test_consoleauth.py
+++ b/nova/tests/test_consoleauth.py
@@ -43,9 +43,6 @@ class ConsoleauthTestCase(test.TestCase):
         self.manager = utils.import_object(FLAGS.consoleauth_manager)
         self.context = context.get_admin_context()
 
-    def tearDown(self):
-        super(ConsoleauthTestCase, self).tearDown()
-
     def test_tokens_expire(self):
         """Test that tokens expire correctly."""
         token = 'mytok'
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index 7236f6167..985de8e26 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -320,9 +320,6 @@ class AggregateDBApiTestCase(test.TestCase):
         self.project_id = 'fake'
         self.context = context.RequestContext(self.user_id, self.project_id)
 
-    def tearDown(self):
-        super(AggregateDBApiTestCase, self).tearDown()
-
     def test_aggregate_create(self):
         """Ensure aggregate can be created with no metadata."""
         result = _create_aggregate(metadata=None)
diff --git a/nova/tests/test_nova_rootwrap.py b/nova/tests/test_nova_rootwrap.py
index 6905bfdc6..bb2ceeb64 100644
--- a/nova/tests/test_nova_rootwrap.py
+++ b/nova/tests/test_nova_rootwrap.py
@@ -34,9 +34,6 @@ class RootwrapTestCase(test.TestCase):
             filters.CommandFilter("/bin/cat", "root")  # Keep this one last
             ]
 
-    def tearDown(self):
-        super(RootwrapTestCase, self).tearDown()
-
     def test_RegExpFilter_match(self):
         usercmd = ["ls", "/root"]
         filtermatch = wrapper.match_filter(self.filters, usercmd)
diff --git a/nova/tests/test_signer.py b/nova/tests/test_signer.py
index 80573e4a8..3fcac7f22 100644
--- a/nova/tests/test_signer.py
+++ b/nova/tests/test_signer.py
@@ -33,9 +33,6 @@ class SignerTestCase(test.TestCase):
         super(SignerTestCase, self).setUp()
         self.signer = signer.Signer('uV3F3YluFJax1cknvbcGwgjvx4QpvB+leU8dUj2o')
 
-    def tearDown(self):
-        super(SignerTestCase, self).tearDown()
-
     # S3 Authorization Signing input & output examples taken from here:
     # http://docs.amazonwebservices.com/AmazonS3/latest/dev/
     def test_s3_authorization_get(self):
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 32d3f8304..6f8ad189b 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -816,9 +816,6 @@ class XenAPIDiffieHellmanTestCase(test.TestCase):
     def test_encrypt_really_long_message(self):
         self._test_encryption(''.join(['abcd' for i in xrange(1024)]))
 
-    def tearDown(self):
-        super(XenAPIDiffieHellmanTestCase, self).tearDown()
-
 
 class XenAPIMigrateInstance(test.TestCase):
     """Unit test for verifying migration-related actions."""
-- 
cgit