Merge "Move load_auth_fixtures()"
This commit is contained in:
commit
7817b0c8a6
|
@ -64,6 +64,8 @@ class BaseTest(testcase.TestCase):
|
||||||
config.post_config()
|
config.post_config()
|
||||||
extend.load_extensions()
|
extend.load_extensions()
|
||||||
|
|
||||||
|
self.load_auth_fixtures()
|
||||||
|
|
||||||
def load_auth_fixtures(self):
|
def load_auth_fixtures(self):
|
||||||
self.auth = FakeSession(token=uuid.uuid4().hex,
|
self.auth = FakeSession(token=uuid.uuid4().hex,
|
||||||
project=uuid.uuid4().hex)
|
project=uuid.uuid4().hex)
|
||||||
|
|
|
@ -24,10 +24,6 @@ from mixmatch.model import insert, ResourceMapping
|
||||||
class TestImages(base.BaseTest):
|
class TestImages(base.BaseTest):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestImages, self).setUp()
|
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):
|
def _construct_url(self, image_id='', sp=None):
|
||||||
if not sp:
|
if not sp:
|
||||||
|
|
|
@ -24,10 +24,6 @@ from mixmatch.tests.unit import samples
|
||||||
class TestVolumesV3(base.BaseTest):
|
class TestVolumesV3(base.BaseTest):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestVolumesV3, self).setUp()
|
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,
|
def _construct_url(self, auth=None, target=None, sp=None,
|
||||||
resource_type='volumes'):
|
resource_type='volumes'):
|
||||||
|
@ -89,10 +85,6 @@ class TestVolumesV3(base.BaseTest):
|
||||||
class TestVolumesV2(base.BaseTest):
|
class TestVolumesV2(base.BaseTest):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestVolumesV2, self).setUp()
|
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):
|
def _construct_url(self, auth=None, target=None, sp=None):
|
||||||
if not sp:
|
if not sp:
|
||||||
|
|
Loading…
Reference in New Issue