commit b3d956fb1d141f6ac9e5e9377b841dd04235c70d
author Joseph Lanoux <joseph.lanoux@hp.com> Wed Jun 25 14:45:24 2014 +0000
committer Joseph Lanoux <joseph.lanoux@hp.com> Tue Jul 01 08:14:01 2014 +0000
tree ae8241dab467f0b3cfd1e8531289a70e34259af5
parent 229583ae545cdfdea7217358e5b30a2a3b8bc103

Add skip decorators in test_servers_negative

This patch adds skip decorators in the resize methods of the
the test_servers_negative test in both admin and servers sections of
tempest/api/compute. When resize=false in tempest.conf, those tests
are therefore skipped. This prevents failures in environments
where resize is disabled.

Change-Id: Ic14a47ee46a4ee2f8278b688ce16c8510f5c6f32
Related-Bug: #1334311

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 15025ba..cccaf13 100644
--- a/tempest/api/compute/admin/test_servers_negative.py
+++ b/tempest/api/compute/admin/test_servers_negative.py
@@ -55,6 +55,8 @@
         return flavor_id
 
     @test.skip_because(bug="1298131")
+    @testtools.skipUnless(CONF.compute_feature_enabled.resize,
+                          'Resize not available.')
     @test.attr(type=['negative', 'gate'])
     def test_resize_server_using_overlimit_ram(self):
         flavor_name = data_utils.rand_name("flavor-")
@@ -74,6 +76,8 @@
                           flavor_ref['id'])
 
     @test.skip_because(bug="1298131")
+    @testtools.skipUnless(CONF.compute_feature_enabled.resize,
+                          'Resize not available.')
     @test.attr(type=['negative', 'gate'])
     def test_resize_server_using_overlimit_vcpus(self):
         flavor_name = data_utils.rand_name("flavor-")

tempest/api/compute/servers/test_servers_negative.py

diff --git a/tempest/api/compute/servers/test_servers_negative.py b/tempest/api/compute/servers/test_servers_negative.py
index 6343ead..d3297ce 100644
--- a/tempest/api/compute/servers/test_servers_negative.py
+++ b/tempest/api/compute/servers/test_servers_negative.py
@@ -106,6 +106,8 @@
         self.assertRaises(exceptions.BadRequest,
                           self.create_test_server, accessIPv6=IPv6)
 
+    @testtools.skipUnless(CONF.compute_feature_enabled.resize,
+                          'Resize not available.')
     @test.attr(type=['negative', 'gate'])
     def test_resize_nonexistent_server(self):
         # Resize a non-existent server
@@ -114,6 +116,8 @@
                           self.client.resize,
                           nonexistent_server, self.flavor_ref)
 
+    @testtools.skipUnless(CONF.compute_feature_enabled.resize,
+                          'Resize not available.')
     @test.attr(type=['negative', 'gate'])
     def test_resize_server_with_non_existent_flavor(self):
         # Resize a server with non-existent flavor
@@ -121,6 +125,8 @@
         self.assertRaises(exceptions.BadRequest, self.client.resize,
                           self.server_id, flavor_ref=nonexistent_flavor)
 
+    @testtools.skipUnless(CONF.compute_feature_enabled.resize,
+                          'Resize not available.')
     @test.attr(type=['negative', 'gate'])
     def test_resize_server_with_null_flavor(self):
         # Resize a server with null flavor