From: Steve Baker <sbaker@redhat.com>
Date: Thu, 11 Jul 2013 04:08:54 +0000 (+1200)
Subject: Global disable scheduler _sleep instead of mocking.
X-Git-Tag: 2014.1~377^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d6b9e3e6340ee6f426c6e5c63bd459f75e890b52;p=openstack-build%2Fheat-build.git

Global disable scheduler _sleep instead of mocking.

It is becoming increasingly difficult to predict when
a call to TaskRunner._sleep needs to be scripted, and is probably an
implementation detail which shouldn't be exposed to unit tests anyway.

This change defines a global which prevents sleeping in calls to _sleep
and toggles that global in HeatTestCase setUp.

Change-Id: I98dc88c9d120c409d5720895bb4fb625a1f12991
---

diff --git a/heat/engine/scheduler.py b/heat/engine/scheduler.py
index 4b010479..20e2e7ed 100644
--- a/heat/engine/scheduler.py
+++ b/heat/engine/scheduler.py
@@ -27,6 +27,10 @@ from heat.openstack.common.gettextutils import _
 logger = logging.getLogger(__name__)
 
 
+# Whether TaskRunner._sleep actually does an eventlet sleep when called.
+ENABLE_SLEEP = True
+
+
 def task_description(task):
     """
     Return a human-readable string description of a task suitable for logging
@@ -101,7 +105,7 @@ class TaskRunner(object):
 
     def _sleep(self, wait_time):
         """Sleep for the specified number of seconds."""
-        if wait_time is not None:
+        if ENABLE_SLEEP and wait_time is not None:
             logger.debug('%s sleeping' % str(self))
             eventlet.sleep(wait_time)
 
diff --git a/heat/tests/common.py b/heat/tests/common.py
index 4a794240..3b57dee9 100644
--- a/heat/tests/common.py
+++ b/heat/tests/common.py
@@ -17,6 +17,7 @@ import fixtures
 import logging
 import mox
 import testtools
+import heat.engine.scheduler as scheduler
 
 
 class HeatTestCase(testtools.TestCase):
@@ -26,3 +27,9 @@ class HeatTestCase(testtools.TestCase):
         self.m = mox.Mox()
         self.addCleanup(self.m.UnsetStubs)
         self.useFixture(fixtures.FakeLogger(level=logging.DEBUG))
+        scheduler.ENABLE_SLEEP = False
+
+        def enable_sleep():
+            scheduler.ENABLE_SLEEP = True
+
+        self.addCleanup(enable_sleep)
diff --git a/heat/tests/test_autoscaling.py b/heat/tests/test_autoscaling.py
index da863589..7f9bb66d 100644
--- a/heat/tests/test_autoscaling.py
+++ b/heat/tests/test_autoscaling.py
@@ -119,7 +119,6 @@ class AutoScalingTest(HeatTestCase):
         return rsrc
 
     def _stub_create(self, num):
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
 
         self.m.StubOutWithMock(instance.Instance, 'handle_create')
         self.m.StubOutWithMock(instance.Instance, 'check_create_complete')
@@ -127,7 +126,6 @@ class AutoScalingTest(HeatTestCase):
         for x in range(num):
             instance.Instance.handle_create().AndReturn(cookie)
         instance.Instance.check_create_complete(cookie).AndReturn(False)
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         instance.Instance.check_create_complete(
             cookie).MultipleTimes().AndReturn(True)
 
@@ -248,14 +246,12 @@ class AutoScalingTest(HeatTestCase):
         self.m.VerifyAll()
         self.m.UnsetStubs()
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
         self.m.StubOutWithMock(instance.Instance, 'handle_suspend')
         self.m.StubOutWithMock(instance.Instance, 'check_suspend_complete')
         inst_cookie = (object(), object(), object())
         instance.Instance.handle_suspend().AndReturn(inst_cookie)
         instance.Instance.check_suspend_complete(inst_cookie).AndReturn(False)
         instance.Instance.check_suspend_complete(inst_cookie).AndReturn(True)
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         self.m.ReplayAll()
 
         scheduler.TaskRunner(rsrc.suspend)()
@@ -281,14 +277,12 @@ class AutoScalingTest(HeatTestCase):
         self.m.VerifyAll()
         self.m.UnsetStubs()
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
         self.m.StubOutWithMock(instance.Instance, 'handle_resume')
         self.m.StubOutWithMock(instance.Instance, 'check_resume_complete')
         inst_cookie = (object(), object(), object())
         instance.Instance.handle_resume().AndReturn(inst_cookie)
         instance.Instance.check_resume_complete(inst_cookie).AndReturn(False)
         instance.Instance.check_resume_complete(inst_cookie).AndReturn(True)
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         self.m.ReplayAll()
 
         rsrc.state_set(rsrc.SUSPEND, rsrc.COMPLETE)
@@ -439,8 +433,6 @@ class AutoScalingTest(HeatTestCase):
         t = template_format.parse(as_template)
         stack = parse_stack(t)
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-
         self.m.StubOutWithMock(instance.Instance, 'handle_create')
         self.m.StubOutWithMock(instance.Instance, 'check_create_complete')
         exc = exception.ResourceFailure(Exception())
diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py
index 617b7dc4..2861d28b 100644
--- a/heat/tests/test_instance.py
+++ b/heat/tests/test_instance.py
@@ -348,8 +348,6 @@ class instancesTest(HeatTestCase):
         get = self.fc.client.get_servers_1234
         get().AndReturn((200, d1))
         get().AndReturn((200, d1))
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         get().AndReturn((200, d2))
         self.m.ReplayAll()
 
@@ -376,8 +374,6 @@ class instancesTest(HeatTestCase):
         get = self.fc.client.get_servers_1234
         get().AndReturn((200, d1))
         get().AndReturn((200, d1))
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         get().AndReturn((200, d2))
         self.m.ReplayAll()
 
@@ -440,8 +436,6 @@ class instancesTest(HeatTestCase):
         get = self.fc.client.get_servers_1234
         get().AndReturn((200, d))
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         self.m.ReplayAll()
 
         instance.state_set(instance.SUSPEND, instance.COMPLETE)
@@ -498,9 +492,6 @@ class instancesTest(HeatTestCase):
             if server._test_check_iterations > 2:
                 server.status = 'ACTIVE'
         return_server.get = activate_status.__get__(return_server)
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         self.m.ReplayAll()
 
         scheduler.TaskRunner(instance.create)()
diff --git a/heat/tests/test_instance_group.py b/heat/tests/test_instance_group.py
index fc140001..5cf13557 100644
--- a/heat/tests/test_instance_group.py
+++ b/heat/tests/test_instance_group.py
@@ -14,8 +14,6 @@
 
 import copy
 
-import mox
-
 from heat.common import exception
 from heat.common import template_format
 from heat.engine.resources import autoscaling as asc
@@ -62,7 +60,6 @@ class InstanceGroupTest(HeatTestCase):
         setup_dummy_db()
 
     def _stub_create(self, num):
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
 
         self.m.StubOutWithMock(instance.Instance, 'handle_create')
         self.m.StubOutWithMock(instance.Instance, 'check_create_complete')
@@ -70,7 +67,6 @@ class InstanceGroupTest(HeatTestCase):
         for x in range(num):
             instance.Instance.handle_create().AndReturn(cookie)
         instance.Instance.check_create_complete(cookie).AndReturn(False)
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         instance.Instance.check_create_complete(
             cookie).MultipleTimes().AndReturn(True)
 
diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py
index aeab875a..d8bd1d3e 100644
--- a/heat/tests/test_loadbalancer.py
+++ b/heat/tests/test_loadbalancer.py
@@ -98,8 +98,6 @@ 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)
diff --git a/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py
index 39458d35..86d56e41 100644
--- a/heat/tests/test_metadata_refresh.py
+++ b/heat/tests/test_metadata_refresh.py
@@ -134,7 +134,6 @@ class MetadataRefreshTest(HeatTestCase):
     '''
     def setUp(self):
         super(MetadataRefreshTest, self).setUp()
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
         self.fc = fakes.FakeKeystoneClient()
         setup_dummy_db()
 
@@ -157,7 +156,6 @@ class MetadataRefreshTest(HeatTestCase):
             instance.Instance.handle_create().AndReturn(cookie)
             create_complete = instance.Instance.check_create_complete(cookie)
             create_complete.InAnyOrder().AndReturn(True)
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         self.m.StubOutWithMock(instance.Instance, 'FnGetAtt')
 
         return stack
diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py
index 82f47ca7..9d3bad56 100644
--- a/heat/tests/test_parser.py
+++ b/heat/tests/test_parser.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 import json
-import mox
 import time
 import uuid
 
@@ -872,10 +871,6 @@ class StackTest(HeatTestCase):
     def test_update_add(self):
         tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType'}}}
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
-        mox.Replay(scheduler.TaskRunner._sleep)
-
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl))
         self.stack.store()
@@ -899,10 +894,6 @@ class StackTest(HeatTestCase):
                 'AResource': {'Type': 'GenericResourceType'},
                 'BResource': {'Type': 'GenericResourceType'}}}
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
-        mox.Replay(scheduler.TaskRunner._sleep)
-
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl))
         self.stack.store()
@@ -924,10 +915,6 @@ class StackTest(HeatTestCase):
         tmpl = {'Description': 'ATemplate',
                 'Resources': {'AResource': {'Type': 'GenericResourceType'}}}
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
-        mox.Replay(scheduler.TaskRunner._sleep)
-
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl))
         self.stack.store()
@@ -950,10 +937,6 @@ class StackTest(HeatTestCase):
         tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
                                             'Properties': {'Foo': 'abc'}}}}
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
-        mox.Replay(scheduler.TaskRunner._sleep)
-
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl))
         self.stack.store()
@@ -983,10 +966,6 @@ class StackTest(HeatTestCase):
         tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
                                             'Properties': {'Foo': 'abc'}}}}
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
-        mox.Replay(scheduler.TaskRunner._sleep)
-
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl),
                                   disable_rollback=True)
@@ -1024,10 +1003,6 @@ class StackTest(HeatTestCase):
         tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
                                             'Properties': {'Foo': 'abc'}}}}
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
-        mox.Replay(scheduler.TaskRunner._sleep)
-
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl),
                                   disable_rollback=True)
@@ -1064,10 +1039,6 @@ class StackTest(HeatTestCase):
         tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
                                             'Properties': {'Foo': 'abc'}}}}
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
-        mox.Replay(scheduler.TaskRunner._sleep)
-
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl),
                                   disable_rollback=True)
@@ -1100,9 +1071,6 @@ class StackTest(HeatTestCase):
     def test_update_add_failed_create(self):
         tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType'}}}
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        mox.Replay(scheduler.TaskRunner._sleep)
-
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl))
         self.stack.store()
@@ -1137,10 +1105,6 @@ class StackTest(HeatTestCase):
         tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
                                             'Properties': {'Foo': 'abc'}}}}
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
-        mox.Replay(scheduler.TaskRunner._sleep)
-
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl),
                                   disable_rollback=False)
@@ -1177,10 +1141,6 @@ class StackTest(HeatTestCase):
         tmpl = {'Resources': {'AResource': {'Type': 'ResourceWithPropsType',
                                             'Properties': {'Foo': 'abc'}}}}
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
-        mox.Replay(scheduler.TaskRunner._sleep)
-
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl),
                                   disable_rollback=False)
@@ -1215,10 +1175,6 @@ class StackTest(HeatTestCase):
     def test_update_rollback_add(self):
         tmpl = {'Resources': {'AResource': {'Type': 'GenericResourceType'}}}
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
-        mox.Replay(scheduler.TaskRunner._sleep)
-
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl),
                                   disable_rollback=False)
@@ -1252,10 +1208,6 @@ class StackTest(HeatTestCase):
                 'AResource': {'Type': 'GenericResourceType'},
                 'BResource': {'Type': 'GenericResourceType'}}}
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
-        mox.Replay(scheduler.TaskRunner._sleep)
-
         self.stack = parser.Stack(self.ctx, 'update_test_stack',
                                   template.Template(tmpl),
                                   disable_rollback=False)
@@ -1306,8 +1258,6 @@ 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)).MultipleTimes()
         self.m.ReplayAll()
 
         self.stack.store()
@@ -1363,8 +1313,6 @@ class StackTest(HeatTestCase):
                                   template.Template(tmpl),
                                   disable_rollback=False)
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
         self.m.ReplayAll()
 
         self.stack.store()
@@ -1440,8 +1388,6 @@ class StackTest(HeatTestCase):
                                   template.Template(tmpl),
                                   disable_rollback=False)
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
         self.m.ReplayAll()
 
         self.stack.store()
@@ -1598,10 +1544,6 @@ class StackTest(HeatTestCase):
                               'DResource': {'Type': 'GenericResourceType',
                                             'DependsOn': 'BResource'}}}
 
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
-        scheduler.TaskRunner._sleep(mox.IsA(int)).MultipleTimes()
-        mox.Replay(scheduler.TaskRunner._sleep)
-
         self.stack = parser.Stack(self.ctx, 'depends_test_stack',
                                   template.Template(tmpl))
         self.stack.store()
diff --git a/heat/tests/test_quantum.py b/heat/tests/test_quantum.py
index fede25fe..a543c712 100644
--- a/heat/tests/test_quantum.py
+++ b/heat/tests/test_quantum.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 
-import mox
 from testtools import skipIf
 
 from heat.common import exception
@@ -212,7 +211,6 @@ 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):
@@ -245,7 +243,6 @@ 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'
@@ -494,7 +491,6 @@ 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):
@@ -551,7 +547,6 @@ 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": {
@@ -679,7 +674,6 @@ 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):
@@ -761,7 +755,6 @@ 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': {
diff --git a/heat/tests/test_volume.py b/heat/tests/test_volume.py
index bf99680b..59a50a72 100644
--- a/heat/tests/test_volume.py
+++ b/heat/tests/test_volume.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 
-import mox
 import json
 
 from testtools import skipIf
@@ -84,7 +83,6 @@ class VolumeTest(HeatTestCase):
         self.m.StubOutWithMock(self.cinder_fc.volumes, 'delete')
         self.m.StubOutWithMock(self.fc.volumes, 'create_server_volume')
         self.m.StubOutWithMock(self.fc.volumes, 'delete_server_volume')
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
         setup_dummy_db()
 
     def create_volume(self, t, stack, resource_name):
@@ -191,7 +189,6 @@ class VolumeTest(HeatTestCase):
         # create script
         clients.OpenStackClients.nova().MultipleTimes().AndReturn(self.fc)
 
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         self.fc.volumes.create_server_volume(
             device=u'/dev/vdc',
             server_id=u'WikiDatabase',
@@ -231,7 +228,6 @@ class VolumeTest(HeatTestCase):
 
         # create script
         clients.OpenStackClients.nova().MultipleTimes().AndReturn(self.fc)
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         self.fc.volumes.create_server_volume(
             device=u'/dev/vdc',
             server_id=u'WikiDatabase',
@@ -297,12 +293,10 @@ class VolumeTest(HeatTestCase):
             'WikiDatabase', 'vol-123').AndRaise(
                 clients.novaclient.exceptions.NotFound('Not found'))
 
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         self.fc.volumes.delete_server_volume(
             'WikiDatabase', 'vol-123').AndRaise(
                 clients.novaclient.exceptions.NotFound('Not found'))
 
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         self.fc.volumes.delete_server_volume(
             'WikiDatabase', 'vol-123').AndRaise(
                 clients.cinderclient.exceptions.NotFound('Not found'))
@@ -478,8 +472,6 @@ class VolumeTest(HeatTestCase):
         fv.update(
             display_description=vol_name,
             display_name=vol_name)
-        # sleep will be called since backup will not complete right away
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
 
         self.m.ReplayAll()
 
@@ -509,8 +501,6 @@ class VolumeTest(HeatTestCase):
         fv.update(
             display_description=vol_name,
             display_name=vol_name)
-        # sleep will be called since backup will not complete right away
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
 
         self.m.ReplayAll()
 
@@ -673,7 +663,6 @@ class VolumeTest(HeatTestCase):
 
         # create script
         clients.OpenStackClients.nova().MultipleTimes().AndReturn(self.fc)
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         self.fc.volumes.create_server_volume(
             device=u'/dev/vdc',
             server_id=u'WikiDatabase',
diff --git a/heat/tests/test_vpc.py b/heat/tests/test_vpc.py
index b9e2cac2..91138242 100644
--- a/heat/tests/test_vpc.py
+++ b/heat/tests/test_vpc.py
@@ -14,14 +14,11 @@
 
 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 import utils
 from heat.tests.utils import setup_dummy_db
@@ -64,15 +61,9 @@ 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
 
diff --git a/heat/tests/test_waitcondition.py b/heat/tests/test_waitcondition.py
index e508ef5c..703511c8 100644
--- a/heat/tests/test_waitcondition.py
+++ b/heat/tests/test_waitcondition.py
@@ -12,8 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mox
-
 import datetime
 import time
 import json
@@ -100,7 +98,6 @@ class WaitConditionTest(HeatTestCase):
         setup_dummy_db()
         self.m.StubOutWithMock(wc.WaitConditionHandle,
                                'get_status')
-        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
 
         cfg.CONF.set_default('heat_waitcondition_server_url',
                              'http://127.0.0.1:8000/v1/waitcondition')
@@ -126,8 +123,6 @@ class WaitConditionTest(HeatTestCase):
             stack.store()
 
         if stub:
-            scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
-
             self.m.StubOutWithMock(wc.WaitConditionHandle, 'keystone')
             wc.WaitConditionHandle.keystone().MultipleTimes().AndReturn(
                 self.fc)
@@ -143,9 +138,7 @@ class WaitConditionTest(HeatTestCase):
     def test_post_success_to_handle(self):
         self.stack = self.create_stack()
         wc.WaitConditionHandle.get_status().AndReturn([])
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn([])
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn(['SUCCESS'])
 
         self.m.ReplayAll()
@@ -165,9 +158,7 @@ class WaitConditionTest(HeatTestCase):
     def test_post_failure_to_handle(self):
         self.stack = self.create_stack()
         wc.WaitConditionHandle.get_status().AndReturn([])
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn([])
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn(['FAILURE'])
 
         self.m.ReplayAll()
@@ -188,11 +179,8 @@ class WaitConditionTest(HeatTestCase):
     def test_post_success_to_handle_count(self):
         self.stack = self.create_stack(template=test_template_wc_count)
         wc.WaitConditionHandle.get_status().AndReturn([])
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn(['SUCCESS'])
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn(['SUCCESS', 'SUCCESS'])
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn(['SUCCESS', 'SUCCESS',
                                                        'SUCCESS'])
 
@@ -213,9 +201,7 @@ class WaitConditionTest(HeatTestCase):
     def test_post_failure_to_handle_count(self):
         self.stack = self.create_stack(template=test_template_wc_count)
         wc.WaitConditionHandle.get_status().AndReturn([])
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn(['SUCCESS'])
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn(['SUCCESS', 'FAILURE'])
 
         self.m.ReplayAll()
@@ -248,10 +234,8 @@ class WaitConditionTest(HeatTestCase):
         scheduler.wallclock().AndReturn(st + 0.001)
         scheduler.wallclock().AndReturn(st + 0.1)
         wc.WaitConditionHandle.get_status().AndReturn([])
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         scheduler.wallclock().AndReturn(st + 4.1)
         wc.WaitConditionHandle.get_status().AndReturn([])
-        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         scheduler.wallclock().AndReturn(st + 5.1)
 
         self.m.ReplayAll()
@@ -409,9 +393,6 @@ class WaitConditionHandleTest(HeatTestCase):
         with UUIDStub('STACKABCD1234'):
             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'])