From: Zane Bitter <zbitter@redhat.com>
Date: Fri, 7 Dec 2012 14:04:15 +0000 (+0100)
Subject: Enable VPC unit tests
X-Git-Tag: 2014.1~1115
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=019149c06ee602c667677f782ea13a8b56047473;p=openstack-build%2Fheat-build.git

Enable VPC unit tests

We don't need quantumclient because the tests use a fake client anyway, so
don't skip the test if it is not installed.

Change-Id: I7cd2447b5a68072d2b43228ab85c53d0124496e5
Signed-off-by: Zane Bitter <zbitter@redhat.com>
---

diff --git a/heat/tests/test_vpc.py b/heat/tests/test_vpc.py
index 4a5a1dc0..447a34cb 100644
--- a/heat/tests/test_vpc.py
+++ b/heat/tests/test_vpc.py
@@ -25,14 +25,6 @@ from heat.common import context
 from heat.common import template_format
 from heat.engine.resources import vpc
 from heat.engine import parser
-from utils import skip_if
-
-try:
-    from quantumclient.v2_0 import client as quantumclient
-except:
-    skip_test = True
-else:
-    skip_test = False
 
 test_template_vpc = '''
 Resources:
@@ -74,10 +66,8 @@ class FakeQuantum():
 @attr(tag=['unit', 'resource'])
 @attr(speed='fast')
 class QuantumTest(unittest.TestCase):
-    @skip_if(skip_test, 'unable to import quantumclient')
     def setUp(self):
         self.m = mox.Mox()
-        self.m.CreateMock(quantumclient)
         self.m.StubOutWithMock(vpc.VPC, 'quantum')
 
     def tearDown(self):
@@ -103,7 +93,6 @@ class QuantumTest(unittest.TestCase):
         self.assertEqual(vpc.VPC.CREATE_COMPLETE, resource.state)
         return resource
 
-    @skip_if(skip_test, 'unable to import quantumclient')
     def test_vpc(self):
         fq = FakeQuantum()
         vpc.VPC.quantum().MultipleTimes().AndReturn(fq)