summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-05 21:57:19 +0000
committerGerrit Code Review <review@openstack.org>2018-07-05 21:57:19 +0000
commit7817b0c8a6c2f5a7b6493d42c44970f77c7293e4 (patch)
tree3c7f3b9db54b8f8c23480bf8450305df687fb9ab
parent0d4ddbf6daa61cf0d96575a8269c14236f0c7eb6 (diff)
parente85c6b6193e6653989b8652ba75de887b733513f (diff)
Merge "Move load_auth_fixtures()"
-rw-r--r--mixmatch/tests/unit/base.py2
-rw-r--r--mixmatch/tests/unit/test_images.py4
-rw-r--r--mixmatch/tests/unit/test_volumes.py8
3 files changed, 2 insertions, 12 deletions
diff --git a/mixmatch/tests/unit/base.py b/mixmatch/tests/unit/base.py
index a84b19e..c77f726 100644
--- a/mixmatch/tests/unit/base.py
+++ b/mixmatch/tests/unit/base.py
@@ -64,6 +64,8 @@ class BaseTest(testcase.TestCase):
64 config.post_config() 64 config.post_config()
65 extend.load_extensions() 65 extend.load_extensions()
66 66
67 self.load_auth_fixtures()
68
67 def load_auth_fixtures(self): 69 def load_auth_fixtures(self):
68 self.auth = FakeSession(token=uuid.uuid4().hex, 70 self.auth = FakeSession(token=uuid.uuid4().hex,
69 project=uuid.uuid4().hex) 71 project=uuid.uuid4().hex)
diff --git a/mixmatch/tests/unit/test_images.py b/mixmatch/tests/unit/test_images.py
index b95d61b..7775144 100644
--- a/mixmatch/tests/unit/test_images.py
+++ b/mixmatch/tests/unit/test_images.py
@@ -24,10 +24,6 @@ from mixmatch.model import insert, ResourceMapping
24class TestImages(base.BaseTest): 24class TestImages(base.BaseTest):
25 def setUp(self): 25 def setUp(self):
26 super(TestImages, self).setUp() 26 super(TestImages, self).setUp()
27 # TODO(ericjuma): load_auth_fixtures() should be done in the base
28 # class, but may conflict with the other tests which haven't been
29 # migrated to these fixtures.
30 self.load_auth_fixtures()
31 27
32 def _construct_url(self, image_id='', sp=None): 28 def _construct_url(self, image_id='', sp=None):
33 if not sp: 29 if not sp:
diff --git a/mixmatch/tests/unit/test_volumes.py b/mixmatch/tests/unit/test_volumes.py
index 427e879..4afd4ca 100644
--- a/mixmatch/tests/unit/test_volumes.py
+++ b/mixmatch/tests/unit/test_volumes.py
@@ -24,10 +24,6 @@ from mixmatch.tests.unit import samples
24class TestVolumesV3(base.BaseTest): 24class TestVolumesV3(base.BaseTest):
25 def setUp(self): 25 def setUp(self):
26 super(TestVolumesV3, self).setUp() 26 super(TestVolumesV3, self).setUp()
27 # TODO(knikolla): load_auth_fixtures() should be done in the base
28 # class, but may conflict with the other tests which haven't been
29 # migrated to these fixtures.
30 self.load_auth_fixtures()
31 27
32 def _construct_url(self, auth=None, target=None, sp=None, 28 def _construct_url(self, auth=None, target=None, sp=None,
33 resource_type='volumes'): 29 resource_type='volumes'):
@@ -89,10 +85,6 @@ class TestVolumesV3(base.BaseTest):
89class TestVolumesV2(base.BaseTest): 85class TestVolumesV2(base.BaseTest):
90 def setUp(self): 86 def setUp(self):
91 super(TestVolumesV2, self).setUp() 87 super(TestVolumesV2, self).setUp()
92 # TODO(knikolla): load_auth_fixtures() should be done in the base
93 # class, but may conflict with the other tests which haven't been
94 # migrated to these fixtures.
95 self.load_auth_fixtures()
96 88
97 def _construct_url(self, auth=None, target=None, sp=None): 89 def _construct_url(self, auth=None, target=None, sp=None):
98 if not sp: 90 if not sp: