From fb59cbd709058f8ed0ad9eabb891c79d31d0b044 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Wed, 22 May 2013 12:40:33 +0200 Subject: [PATCH] Stub out sleeps in quantum unit tests The patch 5d86e2f2ece51a79102aee2af9a3f306c929aaea added wait states into the unit tests for quantum networks, routers and ports, but did not stub out the resulting sleep. This caused the tests to run for over 1s, which indirectly allowed bug #1182285 to become visible. Change-Id: Id26daa87e1618533ee92c33827a9d01800b03752 --- heat/tests/test_quantum.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/heat/tests/test_quantum.py b/heat/tests/test_quantum.py index 6fb9165d..5121b517 100644 --- a/heat/tests/test_quantum.py +++ b/heat/tests/test_quantum.py @@ -13,6 +13,7 @@ # under the License. +import mox from testtools import skipIf from heat.common import exception @@ -194,6 +195,7 @@ class QuantumNetTest(HeatTestCase): self.m.StubOutWithMock(quantumclient.Client, 'create_network') self.m.StubOutWithMock(quantumclient.Client, 'delete_network') self.m.StubOutWithMock(quantumclient.Client, 'show_network') + self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep') setup_dummy_db() def create_net(self, t, stack, resource_name): @@ -206,7 +208,7 @@ class QuantumNetTest(HeatTestCase): quantumclient.Client.create_network({ 'network': {'name': u'the_network', 'admin_state_up': True} }).AndReturn({"network": { - "status": "ACTIVE", + "status": "BUILD", "subnets": [], "name": "name", "admin_state_up": False, @@ -226,6 +228,7 @@ class QuantumNetTest(HeatTestCase): "tenant_id": "c1210485b2424d48804aad5d39c61b8f", "id": "fc68ea2c-b60b-4b4f-bd82-94ec81110766" }}) + scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None) quantumclient.Client.show_network( 'fc68ea2c-b60b-4b4f-bd82-94ec81110766' @@ -400,6 +403,7 @@ class QuantumRouterTest(HeatTestCase): self.m.StubOutWithMock(quantumclient.Client, 'remove_interface_router') self.m.StubOutWithMock(quantumclient.Client, 'add_gateway_router') self.m.StubOutWithMock(quantumclient.Client, 'remove_gateway_router') + self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep') setup_dummy_db() def create_router(self, t, stack, resource_name): @@ -455,6 +459,7 @@ class QuantumRouterTest(HeatTestCase): "id": "3e46229d-8fce-4733-819a-b5fe630550f8" } }) + scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None) quantumclient.Client.show_router( '3e46229d-8fce-4733-819a-b5fe630550f8').AndReturn({ "router": { @@ -582,6 +587,7 @@ class QuantumFloatingIPTest(HeatTestCase): self.m.StubOutWithMock(quantumclient.Client, 'create_port') self.m.StubOutWithMock(quantumclient.Client, 'delete_port') self.m.StubOutWithMock(quantumclient.Client, 'show_port') + self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep') setup_dummy_db() def test_floating_ip(self): @@ -658,6 +664,7 @@ class QuantumFloatingIPTest(HeatTestCase): "status": "BUILD", "id": "fc68ea2c-b60b-4b4f-bd82-94ec81110766" }}) + scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None) quantumclient.Client.show_port( 'fc68ea2c-b60b-4b4f-bd82-94ec81110766' ).AndReturn({'port': { -- 2.45.2