From 5b82e2db04690b5f8b4ecdc593e09793c5baf31d Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 15 May 2013 15:43:29 +1200 Subject: [PATCH] use skipIf for all quantum test skip checks Change-Id: I999c13fd5d2816374ee9fb4d2abe57557583ed9a --- heat/tests/test_quantum.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/heat/tests/test_quantum.py b/heat/tests/test_quantum.py index f83ab6dd..65ed7ba8 100644 --- a/heat/tests/test_quantum.py +++ b/heat/tests/test_quantum.py @@ -227,8 +227,8 @@ class QuantumTest(HeatTestCase): 'router:external': True, 'admin_state_up': False}, props) + @skipIf(net.clients.quantumclient is None, 'quantumclient unavailable') def test_net(self): - skipIf(net.clients.quantumclient is None, 'quantumclient unavailable') fq = FakeQuantum() net.Net.quantum().MultipleTimes().AndReturn(fq) @@ -267,9 +267,8 @@ class QuantumFloatingIPTest(HeatTestCase): self.m.StubOutWithMock(port.Port, 'quantum') setup_dummy_db() + @skipIf(net.clients.quantumclient is None, 'quantumclient unavailable') def test_floating_ip(self): - if net.clients.quantumclient is None: - raise SkipTest fq = FakeQuantum() floatingip.FloatingIP.quantum().MultipleTimes().AndReturn(fq) @@ -302,9 +301,8 @@ class QuantumFloatingIPTest(HeatTestCase): self.m.VerifyAll() + @skipIf(net.clients.quantumclient is None, 'quantumclient unavailable') def test_port(self): - if net.clients.quantumclient is None: - raise SkipTest fq = FakeQuantum() port.Port.quantum().MultipleTimes().AndReturn(fq) @@ -337,9 +335,8 @@ class QuantumFloatingIPTest(HeatTestCase): self.m.VerifyAll() + @skipIf(net.clients.quantumclient is None, 'quantumclient unavailable') def test_floatip_port(self): - if net.clients.quantumclient is None: - raise SkipTest fq = FakeQuantum() floatingip.FloatingIP.quantum().MultipleTimes().AndReturn(fq) -- 2.45.2