commit b91ecd0298500acd70b01ad4a6fe5beae4bab96f
author Jenkins <jenkins@review.openstack.org> Fri Mar 07 10:27:43 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Mar 07 10:27:43 2014 +0000
tree 9b63b903ac0843a5aef3eb366bf201fccc61eaf4
parent be392f2d7ce2940aa5c92c253b28344eb52210f9
parent 36ab3d3efffe5eb174819515403e885949028a08

Merge "Skip nova cli tests with volumes if Cinder unavailable"

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')