openstack/glance
Code Issues Proposed changes

Remove FunctionalInitWrapper

Browse Source 
This is part of our effort to move away from FunctionalTest. The
FunctionalInitWrapper class was only used in
glance/tests/functional/db/test_sqlalchemy.py.

The only thing FunctionalInitWrapper did was set the policy_file in the
fake config; this is also done through the set_policy() method of the
BaseTestCase class, so it is no longer needed.

Change-Id: Ia8e8d51fbea5b0e0edb3863a235ddc52af9a4d65
This commit is contained in:
Cyril Roelandt
2024-12-05 00:12:39 +01:00
parent a293432c3b
commit 5cfecc7999
2 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
glance/tests/functional/db/base.py
View File

@@ -31,7 +31,6 @@ from glance.common import timeutils
from glance import context
from glance.db.sqlalchemy import api as db_api
from glance.db.sqlalchemy import models
from glance.tests import functional
import glance.tests.functional.db as db_tests
from glance.tests import utils as test_utils
@@ -88,13 +87,6 @@ def build_task_fixture(**kwargs):
return task
class FunctionalInitWrapper(functional.FunctionalTest):
def setUp(self):
super(FunctionalInitWrapper, self).setUp()
self.config(policy_file=self.policy_file, group='oslo_policy')
class TestDriver(test_utils.BaseTestCase):
def setUp(self):

33
glance/tests/functional/db/test_sqlalchemy.py
View File

@@ -48,8 +48,7 @@ def reset_db_metadef(db_api):
class TestSqlAlchemyDriver(base.TestDriver,
base.DriverTests,
base.FunctionalInitWrapper):
base.DriverTests):
def setUp(self):
db_tests.load(get_db, reset_db)
@@ -79,8 +78,7 @@ class TestSqlAlchemyDriver(base.TestDriver,
class TestSqlAlchemyVisibility(base.TestVisibility,
base.VisibilityTests,
base.FunctionalInitWrapper):
base.VisibilityTests):
def setUp(self):
db_tests.load(get_db, reset_db)
@@ -89,8 +87,7 @@ class TestSqlAlchemyVisibility(base.TestVisibility,
class TestSqlAlchemyMembershipVisibility(base.TestMembershipVisibility,
base.MembershipVisibilityTests,
base.FunctionalInitWrapper):
base.MembershipVisibilityTests):
def setUp(self):
db_tests.load(get_db, reset_db)
@@ -98,8 +95,7 @@ class TestSqlAlchemyMembershipVisibility(base.TestMembershipVisibility,
self.addCleanup(db_tests.reset)
class TestSqlAlchemyDBDataIntegrity(base.TestDriver,
base.FunctionalInitWrapper):
class TestSqlAlchemyDBDataIntegrity(base.TestDriver):
"""Test class for checking the data integrity in the database.
Helpful in testing scenarios specific to the sqlalchemy api.
@@ -137,8 +133,7 @@ class TestSqlAlchemyDBDataIntegrity(base.TestDriver,
self.db_api.image_get_all(self.context, sort_key=['name'])
class TestSqlAlchemyTask(base.TaskTests,
base.FunctionalInitWrapper):
class TestSqlAlchemyTask(base.TaskTests):
def setUp(self):
db_tests.load(get_db, reset_db)
@@ -146,8 +141,7 @@ class TestSqlAlchemyTask(base.TaskTests,
self.addCleanup(db_tests.reset)
class TestSqlAlchemyQuota(base.DriverQuotaTests,
base.FunctionalInitWrapper):
class TestSqlAlchemyQuota(base.DriverQuotaTests):
def setUp(self):
db_tests.load(get_db, reset_db)
@@ -155,8 +149,7 @@ class TestSqlAlchemyQuota(base.DriverQuotaTests,
self.addCleanup(db_tests.reset)
class TestDBPurge(base.DBPurgeTests,
base.FunctionalInitWrapper):
class TestDBPurge(base.DBPurgeTests):
def setUp(self):
db_tests.load(get_db, reset_db)
@@ -165,8 +158,7 @@ class TestDBPurge(base.DBPurgeTests,
class TestMetadefSqlAlchemyDriver(base_metadef.TestMetadefDriver,
base_metadef.MetadefDriverTests,
base.FunctionalInitWrapper):
base_metadef.MetadefDriverTests):
def setUp(self):
db_tests.load(get_db, reset_db_metadef)
@@ -174,8 +166,7 @@ class TestMetadefSqlAlchemyDriver(base_metadef.TestMetadefDriver,
self.addCleanup(db_tests.reset)
class TestImageCacheOperations(base.TestDriver,
base.FunctionalInitWrapper):
class TestImageCacheOperations(base.TestDriver):
def setUp(self):
db_tests.load(get_db, reset_db)
@@ -296,8 +287,7 @@ class TestImageCacheOperations(base.TestDriver,
self.assertEqual(4, hit_count)
class TestImageAtomicOps(base.TestDriver,
base.FunctionalInitWrapper):
class TestImageAtomicOps(base.TestDriver):
def setUp(self):
db_tests.load(get_db, reset_db)
@@ -486,8 +476,7 @@ class TestImageAtomicOps(base.TestDriver,
self._propdict(image['properties']))
class TestImageStorageUsage(base.TestDriver,
base.FunctionalInitWrapper):
class TestImageStorageUsage(base.TestDriver):
def setUp(self):
db_tests.load(get_db, reset_db)
super(TestImageStorageUsage, self).setUp()