openstack/tempest
Code Issues Proposed changes

Merge "Do not use skip_checks in TestServerAdvancedOps"

Browse Source
This commit is contained in:
Jenkins 2017-03-28 04:13:22 +00:00 committed by Gerrit Code Review
commit 13ee2ca9aa
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tempest/scenario/test_server_advanced_ops.py
View File

@ -36,13 +36,6 @@ class TestServerAdvancedOps(manager.ScenarioTest):
* Sequence suspend resume
"""
@classmethod
def skip_checks(cls):
super(TestServerAdvancedOps, cls).skip_checks()
if CONF.compute.flavor_ref_alt == CONF.compute.flavor_ref:
msg = "Skipping test - flavor_ref and flavor_ref_alt are identical"
raise cls.skipException(msg)
@classmethod
def setup_credentials(cls):
cls.set_network_resources()
@ -52,6 +45,11 @@ class TestServerAdvancedOps(manager.ScenarioTest):
@decorators.idempotent_id('e6c28180-7454-4b59-b188-0257af08a63b')
@testtools.skipUnless(CONF.compute_feature_enabled.resize,
'Resize is not available.')
@testtools.skipUnless(CONF.compute.flavor_ref !=
CONF.compute.flavor_ref_alt
and CONF.compute.flavor_ref_alt != "",
'The flavor_ref_alt option should not be empty and '
'should not be identical with flavor_ref')
@test.services('compute', 'volume')
def test_resize_volume_backed_server_confirm(self):
# We create an instance for use in this test