openstack
/
tempest
Code Issues Proposed changes

Merge "Remove skip condition when resize is enable"

This commit is contained in:
Jenkins 2017-04-26 07:12:39 +00:00 committed by Gerrit Code Review
parent 5e6e5dd8e6 d91094deac
commit a55be93c28
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tempest/config.py
View File

@ -361,7 +361,10 @@ ComputeFeaturesGroup = [
"serial console output?"),
cfg.BoolOpt('resize',
default=False,
help="Does the test environment support resizing?"),
help="Does the test environment support resizing? When you "
"enable this feature, 'flavor_ref_alt' should be set and "
"it should refer to a larger flavor than 'flavor_ref' "
"one."),
cfg.BoolOpt('pause',
default=True,
help="Does the test environment support pausing?"),

3
tempest/scenario/test_network_advanced_server_ops.py
View File

@ -185,9 +185,6 @@ class TestNetworkAdvancedServerOps(manager.NetworkScenarioTest):
@test.services('compute', 'network')
def test_server_connectivity_resize(self):
resize_flavor = CONF.compute.flavor_ref_alt
if resize_flavor == CONF.compute.flavor_ref:
msg = "Skipping test - flavor_ref and flavor_ref_alt are identical"
raise self.skipException(msg)
keypair = self.create_keypair()
server = self._setup_server(keypair)
floating_ip = self._setup_network(server, keypair)

5
tempest/scenario/test_server_advanced_ops.py
View File

@ -45,11 +45,6 @@ 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