Get rid of extra delays in unit tests

Some resource types will now have at least one sleep during their creation
where previously they did not, so unit tests need to stub out the sleep if
they were not already doing so.

Change-Id: I1ae919263c6f12d9219970f226019e53daff052b

diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py
index 1b290e970bde8be039307afd40c61994b01b5f58..453e310921ed59b6e4daee7cc4867cdaee1070c5 100644 (file)
--- a/heat/tests/test_loadbalancer.py
+++ b/heat/tests/test_loadbalancer.py
@@ -98,6 +98,9 @@ class LoadBalancerTest(HeatTestCase):
         return rsrc
 
     def test_loadbalancer(self):
+        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
+        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
+
         self.m.StubOutWithMock(user.User, 'keystone')
         user.User.keystone().AndReturn(self.fkc)
         self.m.StubOutWithMock(user.AccessKey, 'keystone')

diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py
index f76f0f6ea1c7e4857b615edff80d3897205fd3b3..7aebc30266a72f768d00556a39069a16d4017a88 100644 (file)
--- a/heat/tests/test_parser.py
+++ b/heat/tests/test_parser.py
@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import mox
 
 import uuid
 
@@ -22,6 +23,7 @@ from heat.engine import clients
 from heat.engine import resource
 from heat.engine import parser
 from heat.engine import parameters
+from heat.engine import scheduler
 from heat.engine import template
 
 from heat.tests.common import HeatTestCase
@@ -874,8 +876,14 @@ class StackTest(HeatTestCase):
 
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl))
+
+        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
+        self.m.ReplayAll()
+
         self.stack.store()
         self.stack.create()
+        self.m.VerifyAll()
         self.assertEqual(self.stack.state, parser.Stack.CREATE_COMPLETE)
         self.assertEqual(self.stack['AResource'].properties['Foo'], 'abc')
         self.assertEqual(self.stack['BResource'].properties['Foo'],
@@ -926,8 +934,15 @@ class StackTest(HeatTestCase):
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl),
                                   disable_rollback=False)
+
+        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
+        self.m.ReplayAll()
+
         self.stack.store()
         self.stack.create()
+        self.m.VerifyAll()
+
         self.assertEqual(self.stack.state, parser.Stack.CREATE_COMPLETE)
         self.assertEqual(self.stack['AResource'].properties['Foo'], 'abc')
         self.assertEqual(self.stack['BResource'].properties['Foo'],
@@ -987,8 +1002,15 @@ class StackTest(HeatTestCase):
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl),
                                   disable_rollback=False)
+
+        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
+        self.m.ReplayAll()
+
         self.stack.store()
         self.stack.create()
+        self.m.VerifyAll()
+
         self.assertEqual(self.stack.state, parser.Stack.CREATE_COMPLETE)
         self.assertEqual(self.stack['AResource'].properties['Foo'], 'abc')
         self.assertEqual(self.stack['BResource'].properties['Foo'],

diff --git a/heat/tests/test_vpc.py b/heat/tests/test_vpc.py
index 5ed519a5116fb3cb67d4358b381db72622fe0eae..63d013799987ddbebc9d1ad0a3aabb480b88538a 100644 (file)
--- a/heat/tests/test_vpc.py
+++ b/heat/tests/test_vpc.py
@@ -14,11 +14,14 @@
 
 from testtools import skipIf
 
+import mox
+
 from heat.common import context
 from heat.common import exception
 from heat.common import template_format
 from heat.engine import parser
 from heat.engine import resource
+from heat.engine import scheduler
 from heat.tests.common import HeatTestCase
 from heat.tests.utils import setup_dummy_db
 
@@ -58,9 +61,15 @@ class VPCTestBase(HeatTestCase):
         self.m.StubOutWithMock(
             quantumclient.Client, 'delete_security_group_rule')
 
+    def stub_sleep(self):
+        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
+        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
+        mox.Replay(scheduler.TaskRunner._sleep)
+
     def create_stack(self, template):
         t = template_format.parse(template)
         stack = self.parse_stack(t)
+        self.stub_sleep()
         self.assertEqual(None, stack.create())
         return stack
 
@@ -218,6 +227,9 @@ Resources:
     Properties: {CidrBlock: '10.0.0.0/16'}
 '''
 
+    def stub_sleep(self):
+        pass
+
     def test_vpc(self):
         self.mock_create_network()
         self.mock_delete_network()

diff --git a/heat/tests/test_waitcondition.py b/heat/tests/test_waitcondition.py
index 0415bb4104ac8b599238f6b1f8bf851811dc68be..13a4533b050fb968e457bf93a8e57eebd36c0422 100644 (file)
--- a/heat/tests/test_waitcondition.py
+++ b/heat/tests/test_waitcondition.py
@@ -410,6 +410,9 @@ class WaitConditionHandleTest(HeatTestCase):
         self.m.ReplayAll()
         stack.store()
 
+        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
+
         # Stub waitcondition status so all goes CREATE_COMPLETE
         self.m.StubOutWithMock(wc.WaitConditionHandle, 'get_status')
         wc.WaitConditionHandle.get_status().AndReturn(['SUCCESS'])