Inherit from BaseTestCase rather than FunctionalTest when possible
The tests from the following files: glance/tests/functional/test_client_exceptions.py glance/tests/functional/test_client_redirects.py glance/tests/functional/test_glance_manage.py do not need to depend on the FunctionalTest class. Change-Id: I01fcf4cb95835634bdfebe179391517f9fa70966
This commit is contained in:
parent
3ce09a42f4
commit
a468ac01ff
glance/tests/functional
@ -26,7 +26,6 @@ import webob.exc
|
|||||||
from glance.common import client
|
from glance.common import client
|
||||||
from glance.common import exception
|
from glance.common import exception
|
||||||
from glance.common import wsgi
|
from glance.common import wsgi
|
||||||
from glance.tests import functional
|
|
||||||
from glance.tests import utils
|
from glance.tests import utils
|
||||||
|
|
||||||
eventlet.patcher.monkey_patch(socket=True)
|
eventlet.patcher.monkey_patch(socket=True)
|
||||||
@ -66,7 +65,7 @@ class ExceptionTestApp(object):
|
|||||||
raise exception.ServerError()
|
raise exception.ServerError()
|
||||||
|
|
||||||
|
|
||||||
class TestClientExceptions(functional.FunctionalTest):
|
class TestClientExceptions(utils.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestClientExceptions, self).setUp()
|
super(TestClientExceptions, self).setUp()
|
||||||
|
@ -24,7 +24,6 @@ import webob.exc
|
|||||||
from glance.common import client
|
from glance.common import client
|
||||||
from glance.common import exception
|
from glance.common import exception
|
||||||
from glance.common import wsgi
|
from glance.common import wsgi
|
||||||
from glance.tests import functional
|
|
||||||
from glance.tests import utils
|
from glance.tests import utils
|
||||||
|
|
||||||
|
|
||||||
@ -80,7 +79,7 @@ def RedirectTestApp(name):
|
|||||||
return App
|
return App
|
||||||
|
|
||||||
|
|
||||||
class TestClientRedirects(functional.FunctionalTest):
|
class TestClientRedirects(utils.BaseTestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestClientRedirects, self).setUp()
|
super(TestClientRedirects, self).setUp()
|
||||||
|
@ -26,7 +26,7 @@ from glance.db import migration as db_migration
|
|||||||
from glance.db.sqlalchemy import alembic_migrations
|
from glance.db.sqlalchemy import alembic_migrations
|
||||||
from glance.db.sqlalchemy.alembic_migrations import data_migrations
|
from glance.db.sqlalchemy.alembic_migrations import data_migrations
|
||||||
from glance.db.sqlalchemy import api as db_api
|
from glance.db.sqlalchemy import api as db_api
|
||||||
from glance.tests import functional
|
from glance.tests import utils as test_utils
|
||||||
from glance.tests.utils import depends_on_exe
|
from glance.tests.utils import depends_on_exe
|
||||||
from glance.tests.utils import execute
|
from glance.tests.utils import execute
|
||||||
from glance.tests.utils import skip_if_disabled
|
from glance.tests.utils import skip_if_disabled
|
||||||
@ -34,7 +34,7 @@ from glance.tests.utils import skip_if_disabled
|
|||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
|
|
||||||
|
|
||||||
class TestGlanceManage(functional.FunctionalTest):
|
class TestGlanceManage(test_utils.BaseTestCase):
|
||||||
"""Functional tests for glance-manage"""
|
"""Functional tests for glance-manage"""
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user