summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2013-03-06 23:58:59 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2013-03-06 23:58:59 +0000
commitbb6fbb96273dadd6dcf409e3b014a968c438d51f (patch)
treef958eccad9cc30ab8a19cd121b0f9847a70cc2b7
parent2ed9ea6504bd864f7631a26b9fdb2fc683f39a60 (diff)
Remove unnecessary setUp() and tearDown() methods
It's unnecessary to implement setUp() and tearDown() when they only call the parent class method of the same name. Change-Id: I8a2c7f50e17def87ada8d4f1c1b554eb916afbd1
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_agents.py3
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_fixed_ips.py3
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_floating_ip_bulk.py3
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_services.py3
-rw-r--r--nova/tests/compute/test_resource_tracker.py4
-rw-r--r--nova/tests/integrated/test_api_samples.py6
-rw-r--r--nova/tests/test_libvirt.py3
-rw-r--r--nova/tests/test_virt_disk_vfs_localfs.py4
-rw-r--r--nova/tests/test_virt_drivers.py3
-rw-r--r--nova/tests/virt/xenapi/imageupload/test_glance.py3
10 files changed, 0 insertions, 35 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_agents.py b/nova/tests/api/openstack/compute/contrib/test_agents.py
index e7a27fe18..0250b9ac5 100644
--- a/nova/tests/api/openstack/compute/contrib/test_agents.py
+++ b/nova/tests/api/openstack/compute/contrib/test_agents.py
@@ -98,9 +98,6 @@ class AgentsTest(test.TestCase):
self.context = context.get_admin_context()
self.controller = agents.AgentController()
- def tearDown(self):
- super(AgentsTest, self).tearDown()
-
def test_agents_create(self):
req = FakeRequest()
body = {'agent': {'hypervisor': 'kvm',
diff --git a/nova/tests/api/openstack/compute/contrib/test_fixed_ips.py b/nova/tests/api/openstack/compute/contrib/test_fixed_ips.py
index 1ea637092..818bc3dff 100644
--- a/nova/tests/api/openstack/compute/contrib/test_fixed_ips.py
+++ b/nova/tests/api/openstack/compute/contrib/test_fixed_ips.py
@@ -106,9 +106,6 @@ class FixedIpTest(test.TestCase):
self.context = context.get_admin_context()
self.controller = fixed_ips.FixedIPController()
- def tearDown(self):
- super(FixedIpTest, self).tearDown()
-
def test_fixed_ips_get(self):
req = fakes.HTTPRequest.blank('/v2/fake/os-fixed-ips/192.168.1.1')
res_dict = self.controller.show(req, '192.168.1.1')
diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ip_bulk.py b/nova/tests/api/openstack/compute/contrib/test_floating_ip_bulk.py
index d8d478605..5521eddb1 100644
--- a/nova/tests/api/openstack/compute/contrib/test_floating_ip_bulk.py
+++ b/nova/tests/api/openstack/compute/contrib/test_floating_ip_bulk.py
@@ -32,9 +32,6 @@ class FloatingIPBulk(test.TestCase):
self.context = context.get_admin_context()
self.controller = floating_ips_bulk.FloatingIPBulkController()
- def tearDown(self):
- super(FloatingIPBulk, self).tearDown()
-
def _setup_floating_ips(self, ip_range):
body = {'floating_ips_bulk_create': {'ip_range': ip_range}}
req = fakes.HTTPRequest.blank('/v2/fake/os-floating-ips-bulk')
diff --git a/nova/tests/api/openstack/compute/contrib/test_services.py b/nova/tests/api/openstack/compute/contrib/test_services.py
index 98be46def..d4bf62d19 100644
--- a/nova/tests/api/openstack/compute/contrib/test_services.py
+++ b/nova/tests/api/openstack/compute/contrib/test_services.py
@@ -121,9 +121,6 @@ class ServicesTest(test.TestCase):
self.context = context.get_admin_context()
self.controller = services.ServiceController()
- def tearDown(self):
- super(ServicesTest, self).tearDown()
-
def test_services_list(self):
req = FakeRequest()
res_dict = self.controller.index(req)
diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py
index dc1dc770c..860ea9fab 100644
--- a/nova/tests/compute/test_resource_tracker.py
+++ b/nova/tests/compute/test_resource_tracker.py
@@ -877,10 +877,6 @@ class ResizeClaimTestCase(BaseTrackerTestCase):
class OrphanTestCase(BaseTrackerTestCase):
-
- def setUp(self):
- super(OrphanTestCase, self).setUp()
-
def _driver(self):
class OrphanVirtDriver(FakeVirtDriver):
def get_per_instance_usage(self):
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index d88206914..0cb18da4a 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -1605,9 +1605,6 @@ class CloudPipeUpdateJsonTest(ApiSampleTestBase):
'nova.api.openstack.compute.contrib.cloudpipe.Cloudpipe')
return f
- def setUp(self):
- super(CloudPipeUpdateJsonTest, self).setUp()
-
def test_cloud_pipe_update(self):
subs = {'vpn_ip': '192.168.1.1',
'vpn_port': 2000}
@@ -1882,9 +1879,6 @@ class CertificatesSamplesJsonTest(ApiSampleTestBase):
extension_name = ("nova.api.openstack.compute.contrib.certificates."
"Certificates")
- def setUp(self):
- super(CertificatesSamplesJsonTest, self).setUp()
-
def test_create_certificates(self):
response = self._do_post('os-certificates',
'certificate-create-req', {})
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 10ef7805d..2b405152e 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -171,9 +171,6 @@ class CacheConcurrencyTestCase(test.TestCase):
'nova.virt.libvirt.imagebackend.libvirt_utils',
fake_libvirt_utils))
- def tearDown(self):
- super(CacheConcurrencyTestCase, self).tearDown()
-
def test_same_fname_concurrency(self):
# Ensures that the same fname cache runs at a sequentially.
uuid = uuidutils.generate_uuid()
diff --git a/nova/tests/test_virt_disk_vfs_localfs.py b/nova/tests/test_virt_disk_vfs_localfs.py
index 096a75964..5bbac670e 100644
--- a/nova/tests/test_virt_disk_vfs_localfs.py
+++ b/nova/tests/test_virt_disk_vfs_localfs.py
@@ -148,10 +148,6 @@ class VirtDiskVFSLocalFSTestPaths(test.TestCase):
class VirtDiskVFSLocalFSTest(test.TestCase):
-
- def setUp(self):
- super(VirtDiskVFSLocalFSTest, self).setUp()
-
def test_makepath(self):
global dirs, commands
dirs = []
diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py
index ae7f410ff..395663600 100644
--- a/nova/tests/test_virt_drivers.py
+++ b/nova/tests/test_virt_drivers.py
@@ -192,9 +192,6 @@ class _VirtDriverTestCase(_FakeDriverBackendTestCase):
self.ctxt = test_utils.get_test_admin_context()
self.image_service = fake_image.FakeImageService()
- def tearDown(self):
- super(_VirtDriverTestCase, self).tearDown()
-
def _get_running_instance(self):
instance_ref = test_utils.get_test_instance()
network_info = test_utils.get_test_network_info()
diff --git a/nova/tests/virt/xenapi/imageupload/test_glance.py b/nova/tests/virt/xenapi/imageupload/test_glance.py
index 05e7f7551..34e95ab80 100644
--- a/nova/tests/virt/xenapi/imageupload/test_glance.py
+++ b/nova/tests/virt/xenapi/imageupload/test_glance.py
@@ -30,9 +30,6 @@ class TestGlanceStore(test.TestCase):
self.store = glance.GlanceStore()
self.mox = mox.Mox()
- def tearDown(self):
- super(TestGlanceStore, self).tearDown()
-
def test_upload_image(self):
glance_host = '0.1.2.3'
glance_port = 8143