Merge "Move load_auth_fixtures()"

This commit is contained in:
Zuul 2018-07-05 21:57:19 +00:00 committed by Gerrit Code Review
commit 7817b0c8a6
3 changed files with 2 additions and 12 deletions

View File

@ -64,6 +64,8 @@ class BaseTest(testcase.TestCase):
config.post_config()
extend.load_extensions()
self.load_auth_fixtures()
def load_auth_fixtures(self):
self.auth = FakeSession(token=uuid.uuid4().hex,
project=uuid.uuid4().hex)

View File

@ -24,10 +24,6 @@ from mixmatch.model import insert, ResourceMapping
class TestImages(base.BaseTest):
def setUp(self):
super(TestImages, self).setUp()
# TODO(ericjuma): load_auth_fixtures() should be done in the base
# class, but may conflict with the other tests which haven't been
# migrated to these fixtures.
self.load_auth_fixtures()
def _construct_url(self, image_id='', sp=None):
if not sp:

View File

@ -24,10 +24,6 @@ from mixmatch.tests.unit import samples
class TestVolumesV3(base.BaseTest):
def setUp(self):
super(TestVolumesV3, self).setUp()
# TODO(knikolla): load_auth_fixtures() should be done in the base
# class, but may conflict with the other tests which haven't been
# migrated to these fixtures.
self.load_auth_fixtures()
def _construct_url(self, auth=None, target=None, sp=None,
resource_type='volumes'):
@ -89,10 +85,6 @@ class TestVolumesV3(base.BaseTest):
class TestVolumesV2(base.BaseTest):
def setUp(self):
super(TestVolumesV2, self).setUp()
# TODO(knikolla): load_auth_fixtures() should be done in the base
# class, but may conflict with the other tests which haven't been
# migrated to these fixtures.
self.load_auth_fixtures()
def _construct_url(self, auth=None, target=None, sp=None):
if not sp: