summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-03-16 15:11:39 -0700
committerJustin Santa Barbara <justin@fathomdb.com>2011-03-16 15:11:39 -0700
commit65b11b3b9c76db2440d480bbc41b72f24bee8afc (patch)
treeceb41fcbac35c083a2ddf6576d67b269226df9ca
parenta7990e0263f2113e3814209118ecb2afc140826e (diff)
downloadnova-65b11b3b9c76db2440d480bbc41b72f24bee8afc.tar.gz
nova-65b11b3b9c76db2440d480bbc41b72f24bee8afc.tar.xz
nova-65b11b3b9c76db2440d480bbc41b72f24bee8afc.zip
Avoid mixins on image tests, keeping pylint much happier
-rw-r--r--nova/tests/api/openstack/test_images.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index 76f758929..9a33236af 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -41,10 +41,15 @@ from nova.tests.api.openstack import fakes
FLAGS = flags.FLAGS
-class BaseImageServiceTests(object):
+class _BaseImageServiceTests(test.TestCase):
"""Tasks to test for all image services"""
+ def __init__(self):
+ super(_BaseImageServiceTests, self).__init__()
+ self.service = None
+ self.context = None
+
def test_create(self):
fixture = {'name': 'test image',
@@ -132,8 +137,7 @@ class BaseImageServiceTests(object):
self.assertEquals(1, num_images)
-class LocalImageServiceTest(test.TestCase,
- BaseImageServiceTests):
+class LocalImageServiceTest(_BaseImageServiceTests):
"""Tests the local image service"""
@@ -152,8 +156,7 @@ class LocalImageServiceTest(test.TestCase,
super(LocalImageServiceTest, self).tearDown()
-class GlanceImageServiceTest(test.TestCase,
- BaseImageServiceTests):
+class GlanceImageServiceTest(_BaseImageServiceTests):
"""Tests the local image service"""