Skip quantum unit tests if client not installed

Quantum is optional, so we should skip unit tests that require
quantumclient if it is not available.

Fixes bug 1152242

Change-Id: I6c399b1845adfe457051c372601db6352cdf6261

diff --git a/heat/tests/test_quantum.py b/heat/tests/test_quantum.py
index 9b8d6514f83c6baba177e000bf8a55c2448a65c0..ec602e092c8c88b01dcb26c77a7f34c0d26f8458 100644 (file)
--- a/heat/tests/test_quantum.py
+++ b/heat/tests/test_quantum.py
@@ -19,6 +19,7 @@ import unittest
 import mox
 
 from nose.plugins.attrib import attr
+from nose.exc import SkipTest
 
 from heat.common import context
 from heat.common import exception
@@ -166,6 +167,9 @@ class QuantumTest(unittest.TestCase):
                           'admin_state_up': False}, props)
 
     def test_net(self):
+        if net.clients.quantumclient is None:
+            raise SkipTest
+
         fq = FakeQuantum()
         net.Net.quantum().MultipleTimes().AndReturn(fq)
 
@@ -232,6 +236,9 @@ class QuantumFloatingIPTest(unittest.TestCase):
         return stack
 
     def test_floating_ip(self):
+        if net.clients.quantumclient is None:
+            raise SkipTest
+
         fq = FakeQuantum()
         floatingip.FloatingIP.quantum().MultipleTimes().AndReturn(fq)
 
@@ -264,6 +271,9 @@ class QuantumFloatingIPTest(unittest.TestCase):
         self.m.VerifyAll()
 
     def test_port(self):
+        if net.clients.quantumclient is None:
+            raise SkipTest
+
         fq = FakeQuantum()
         port.Port.quantum().MultipleTimes().AndReturn(fq)
 
@@ -296,6 +306,9 @@ class QuantumFloatingIPTest(unittest.TestCase):
         self.m.VerifyAll()
 
     def test_floatip_port(self):
+        if net.clients.quantumclient is None:
+            raise SkipTest
+
         fq = FakeQuantum()
         floatingip.FloatingIP.quantum().MultipleTimes().AndReturn(fq)
         floatingip.FloatingIPAssociation.quantum().\

diff --git a/heat/tests/test_template_format.py b/heat/tests/test_template_format.py
index 9c6197e9617a53eb8e7c6c91b63a9552df02c052..c92fdeb653893ceb5f07077c04561d01ab214648 100644 (file)
--- a/heat/tests/test_template_format.py
+++ b/heat/tests/test_template_format.py
@@ -13,9 +13,11 @@
 #    under the License.
 
 from nose.plugins.attrib import attr
+from nose.exc import SkipTest
 import os
 import unittest
 
+from heat.engine import clients
 from heat.common import context
 from heat.common import template_format
 from heat.engine import parser
@@ -146,6 +148,8 @@ class JsonYamlResolvedCompareTest(unittest.TestCase):
             self.assertEqual(stack1.resources[key].t, stack2.resources[key].t)
 
     def test_quantum_resolved(self):
+        if clients.quantumclient is None:
+            raise SkipTest
         self.compare_stacks('Quantum.template', 'Quantum.yaml', {})
 
     def test_wordpress_resolved(self):