diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-04-09 16:09:16 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-04-09 16:09:16 +0000 |
commit | c21afc0a4274bc828832c3146f4770360fb432ef (patch) | |
tree | a619a3232e57d89d39d1ceb364b8d370dc835b8b | |
parent | 8165079f99bb38053e2f9dc32425853edc094e43 (diff) | |
parent | afecec0375f5cbd9f58994ee3cdca08d095b2c58 (diff) | |
download | tempest-c21afc0a4274bc828832c3146f4770360fb432ef.tar.gz |
Merge "Prevent failures when running as non-admin"
-rw-r--r-- | tempest/api/compute/base.py | 2 | ||||
-rw-r--r-- | tempest/api/volume/base.py | 16 | ||||
-rw-r--r-- | tempest/scenario/test_aggregates_basic_ops.py | 8 | ||||
-rw-r--r-- | tempest/test.py | 10 |
4 files changed, 26 insertions, 10 deletions
diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py index 4995209c4..9f1a5488a 100644 --- a/tempest/api/compute/base.py +++ b/tempest/api/compute/base.py @@ -352,10 +352,10 @@ class BaseComputeAdminTest(BaseComputeTest): @classmethod def skip_checks(cls): + super(BaseComputeAdminTest, cls).skip_checks() if not credentials.is_admin_available(): msg = ("Missing Identity Admin API credentials in configuration.") raise cls.skipException(msg) - super(BaseComputeAdminTest, cls).skip_checks() @classmethod def setup_credentials(cls): diff --git a/tempest/api/volume/base.py b/tempest/api/volume/base.py index 1f76b1c13..28676b007 100644 --- a/tempest/api/volume/base.py +++ b/tempest/api/volume/base.py @@ -18,6 +18,7 @@ from tempest_lib.common.utils import data_utils from tempest_lib import exceptions as lib_exc from tempest import clients +from tempest.common import credentials from tempest.common import fixed_network from tempest import config from tempest import exceptions @@ -175,14 +176,17 @@ class BaseVolumeAdminTest(BaseVolumeTest): """Base test case class for all Volume Admin API tests.""" @classmethod + def skip_checks(cls): + super(BaseVolumeAdminTest, cls).skip_checks() + if not credentials.is_admin_available(): + msg = ("Missing Identity Admin API credentials in configuration.") + raise cls.skipException(msg) + + @classmethod def setup_credentials(cls): super(BaseVolumeAdminTest, cls).setup_credentials() - try: - cls.adm_creds = cls.isolated_creds.get_admin_creds() - cls.os_adm = clients.Manager(credentials=cls.adm_creds) - except NotImplementedError: - msg = "Missing Volume Admin API credentials in configuration." - raise cls.skipException(msg) + cls.adm_creds = cls.isolated_creds.get_admin_creds() + cls.os_adm = clients.Manager(credentials=cls.adm_creds) @classmethod def setup_clients(cls): diff --git a/tempest/scenario/test_aggregates_basic_ops.py b/tempest/scenario/test_aggregates_basic_ops.py index 92e6c746e..c5e80124c 100644 --- a/tempest/scenario/test_aggregates_basic_ops.py +++ b/tempest/scenario/test_aggregates_basic_ops.py @@ -16,6 +16,7 @@ from oslo_log import log as logging from tempest_lib.common.utils import data_utils +from tempest.common import credentials from tempest.common import tempest_fixtures as fixtures from tempest.scenario import manager from tempest import test @@ -34,6 +35,13 @@ class TestAggregatesBasicOps(manager.ScenarioTest): Deletes aggregate """ @classmethod + def skip_checks(cls): + super(TestAggregatesBasicOps, cls).skip_checks() + if not credentials.is_admin_available(): + msg = ("Missing Identity Admin API credentials in configuration.") + raise cls.skipException(msg) + + @classmethod def setup_clients(cls): super(TestAggregatesBasicOps, cls).setup_clients() cls.aggregates_client = cls.manager.aggregates_client diff --git a/tempest/test.py b/tempest/test.py index 258599995..d57b1d832 100644 --- a/tempest/test.py +++ b/tempest/test.py @@ -472,8 +472,6 @@ class NegativeAutoTest(BaseTestCase): super(NegativeAutoTest, cls).setUpClass() os = cls.get_client_manager() cls.client = os.negative_client - os_admin = clients.AdminManager(service=cls._service) - cls.admin_client = os_admin.negative_client @staticmethod def load_tests(*args): @@ -601,7 +599,13 @@ class NegativeAutoTest(BaseTestCase): "mechanism") if "admin_client" in description and description["admin_client"]: - client = self.admin_client + if not credentials.is_admin_available(): + msg = ("Missing Identity Admin API credentials in" + "configuration.") + raise self.skipException(msg) + creds = self.isolated_creds.get_admin_creds() + os_adm = clients.Manager(credentials=creds) + client = os_adm.negative_client else: client = self.client resp, resp_body = client.send_request(method, new_url, |