Merge "Correct skip condition for migrate_server"

This commit is contained in:
Jenkins 2017-05-06 10:17:10 +00:00 committed by Gerrit Code Review
commit 69966c9e46

View File

@ -124,8 +124,8 @@ class ServersAdminNegativeTestJSON(base.BaseV2ComputeAdminTest):
data_utils.rand_uuid()) data_utils.rand_uuid())
@decorators.idempotent_id('b0b17f83-d14e-4fc4-8f31-bcc9f3cfa629') @decorators.idempotent_id('b0b17f83-d14e-4fc4-8f31-bcc9f3cfa629')
@testtools.skipUnless(CONF.compute_feature_enabled.resize, @testtools.skipUnless(CONF.compute_feature_enabled.cold_migration,
'Resize not available.') 'Cold migration not available.')
@testtools.skipUnless(CONF.compute_feature_enabled.suspend, @testtools.skipUnless(CONF.compute_feature_enabled.suspend,
'Suspend is not available.') 'Suspend is not available.')
@decorators.attr(type=['negative']) @decorators.attr(type=['negative'])