openstack
/
manila
Code Issues Proposed changes

Merge "Allow skipping manila tempest tests."

This commit is contained in:
Jenkins 2017-01-13 12:37:58 +00:00 committed by Gerrit Code Review
parent 75e685d40d 5dc5ecf392
commit 2455c2ef60
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manila_tempest_tests/tests/api/base.py
View File

@ -220,6 +220,12 @@ class BaseSharesTest(test.BaseTestCase):
cls.method_resources.insert(0, resource)
return client
@classmethod
def skip_checks(cls):
super(BaseSharesTest, cls).skip_checks()
if not CONF.service_available.manila:
raise cls.skipException("Manila support is required")
@classmethod
def verify_nonempty(cls, *args):
if not all(args):

6
manila_tempest_tests/tests/scenario/manager_share.py
View File

@ -50,6 +50,12 @@ class ShareScenarioTest(manager.NetworkScenarioTest):
cls.shares_admin_v2_client = shares_v2_client.SharesV2Client(
cls.os_admin.auth_provider)
@classmethod
def skip_checks(cls):
super(ShareScenarioTest, cls).skip_checks()
if not CONF.service_available.manila:
raise cls.skipException("Manila support is required")
def _create_share(self, share_protocol=None, size=None, name=None,
snapshot_id=None, description=None, metadata=None,
share_network_id=None, share_type_id=None,