commit 36ab3d3efffe5eb174819515403e885949028a08
author Eric Windisch <ewindisch@docker.com> Wed Mar 05 13:09:27 2014 -0500
committer Eric Windisch <ewindisch@docker.com> Thu Mar 06 11:22:44 2014 -0500
tree 8bbd17ea17c89ce04b90a6f69c1764da0b54a75c
parent b1151496986bf79fab5a3ac1f8226c1ffd48a1db

Skip nova cli tests with volumes if Cinder unavailable

The nova cli tests for volumes will fail if Cinder is
not being tested. As it is allowable to skip Cinder tests,
we should skip these tests in that eventuality.

Change-Id: Ia3c82d416962dad446390b82780978ddaf03f1b2
Closes-Bug: #1288373

tempest/cli/simple_read_only/test_nova.py

diff --git a/tempest/cli/simple_read_only/test_nova.py b/tempest/cli/simple_read_only/test_nova.py
index b0264d0..d0b6028 100644
--- a/tempest/cli/simple_read_only/test_nova.py
+++ b/tempest/cli/simple_read_only/test_nova.py
@@ -154,12 +154,18 @@
     def test_admin_usage_list(self):
         self.nova('usage-list')
 
+    @testtools.skipIf(not CONF.service_available.cinder,
+                      "Skipped as Cinder is not available")
     def test_admin_volume_list(self):
         self.nova('volume-list')
 
+    @testtools.skipIf(not CONF.service_available.cinder,
+                      "Skipped as Cinder is not available")
     def test_admin_volume_snapshot_list(self):
         self.nova('volume-snapshot-list')
 
+    @testtools.skipIf(not CONF.service_available.cinder,
+                      "Skipped as Cinder is not available")
     def test_admin_volume_type_list(self):
         self.nova('volume-type-list')