commit 02ac93e49800310f8cd1cc46615a2b11a363f54b
author Jenkins <jenkins@review.openstack.org> Sun Jul 27 18:41:28 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sun Jul 27 18:41:28 2014 +0000
tree 3840a7e66b505610441a9872f1b5144eb9417bba
parent 5ac9a6fc58a7f0a99a7713529e3ce2a6f37f1efb
parent 3df237cc7097574aa63dcbd5d5102dc0d9876075

Merge "Skip migrate server invalid state if resize is off"

tempest/api/compute/admin/test_servers_negative.py

diff --git a/tempest/api/compute/admin/test_servers_negative.py b/tempest/api/compute/admin/test_servers_negative.py
index cccaf13..f4d010e 100644
--- a/tempest/api/compute/admin/test_servers_negative.py
+++ b/tempest/api/compute/admin/test_servers_negative.py
@@ -127,6 +127,8 @@
                           self.client.migrate_server,
                           str(uuid.uuid4()))
 
+    @testtools.skipUnless(CONF.compute_feature_enabled.resize,
+                          'Resize not available.')
     @testtools.skipUnless(CONF.compute_feature_enabled.suspend,
                           'Suspend is not available.')
     @test.attr(type=['negative', 'gate'])