Merge "Allow skipping manila tempest tests."
This commit is contained in:
commit
2455c2ef60
|
@ -220,6 +220,12 @@ class BaseSharesTest(test.BaseTestCase):
|
||||||
cls.method_resources.insert(0, resource)
|
cls.method_resources.insert(0, resource)
|
||||||
return client
|
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
|
@classmethod
|
||||||
def verify_nonempty(cls, *args):
|
def verify_nonempty(cls, *args):
|
||||||
if not all(args):
|
if not all(args):
|
||||||
|
|
|
@ -50,6 +50,12 @@ class ShareScenarioTest(manager.NetworkScenarioTest):
|
||||||
cls.shares_admin_v2_client = shares_v2_client.SharesV2Client(
|
cls.shares_admin_v2_client = shares_v2_client.SharesV2Client(
|
||||||
cls.os_admin.auth_provider)
|
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,
|
def _create_share(self, share_protocol=None, size=None, name=None,
|
||||||
snapshot_id=None, description=None, metadata=None,
|
snapshot_id=None, description=None, metadata=None,
|
||||||
share_network_id=None, share_type_id=None,
|
share_network_id=None, share_type_id=None,
|
||||||
|
|
Loading…
Reference in New Issue