Refine skip messages
Fix a few nits in skip messages. Change-Id: Ie2da617839983f71dab459ce5afa698ad21441a9
This commit is contained in:
parent
eb19ad160a
commit
47ae16b5d3
|
@ -30,12 +30,12 @@ class TestCinderVolumes(base.BaseApplicationCatalogScenarioTest):
|
|||
def skip_checks(cls):
|
||||
super(TestCinderVolumes, cls).skip_checks()
|
||||
if not CONF.service_available.cinder:
|
||||
msg = "Cinder is not available. Skipping volumes attachment tests"
|
||||
msg = "Cinder is not available. Skipping volumes tests"
|
||||
raise cls.skipException(msg)
|
||||
if (not CONF.volume_feature_enabled.api_v3 and
|
||||
not CONF.volume_feature_enabled.api_v2):
|
||||
msg = ("Neither cinder v2 nor v3 are not available. Skipping"
|
||||
"volumes attachment tests")
|
||||
msg = ("Neither cinder v2 nor v3 are available. Skipping"
|
||||
"volumes tests")
|
||||
raise cls.skipException(msg)
|
||||
|
||||
@classmethod
|
||||
|
@ -53,7 +53,7 @@ class TestCinderVolumes(base.BaseApplicationCatalogScenarioTest):
|
|||
@classmethod
|
||||
def resource_setup(cls):
|
||||
if not CONF.application_catalog.cinder_volume_tests:
|
||||
msg = "Cinder volumes attachment tests will be skipped."
|
||||
msg = "Cinder volumes tests will be skipped."
|
||||
raise cls.skipException(msg)
|
||||
super(TestCinderVolumes, cls).resource_setup()
|
||||
cls.linux = CONF.application_catalog.linux_image
|
||||
|
|
Loading…
Reference in New Issue