Remove eventlet dependency from unit tests

Unit tests should not need to know about eventlet. Instead of stubbing
eventlet.sleep(), stub out the TaskRunner._sleep() method in the scheduler.

Change-Id: I438a5d6978ed228d62a0d28fef30115d205bd2c3

diff --git a/heat/tests/test_autoscaling.py b/heat/tests/test_autoscaling.py
index f4b9d8043f8e9453c5cd3b1b68b8b63e2ed3c2b6..f0036453deac99ee8de491b3054fb11db2a44ad6 100644 (file)
--- a/heat/tests/test_autoscaling.py
+++ b/heat/tests/test_autoscaling.py
@@ -15,7 +15,6 @@
 import datetime
 import copy
 
-import eventlet
 import mox
 
 from heat.common import template_format
@@ -105,7 +104,7 @@ class AutoScalingTest(HeatTestCase):
         return rsrc
 
     def _stub_create(self, num):
-        self.m.StubOutWithMock(eventlet, 'sleep')
+        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
 
         self.m.StubOutWithMock(instance.Instance, 'handle_create')
         self.m.StubOutWithMock(instance.Instance, 'check_create_complete')
@@ -113,7 +112,7 @@ class AutoScalingTest(HeatTestCase):
         for x in range(num):
             instance.Instance.handle_create().AndReturn(cookie)
         instance.Instance.check_create_complete(cookie).AndReturn(False)
-        eventlet.sleep(mox.IsA(int)).AndReturn(None)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         instance.Instance.check_create_complete(
             cookie).MultipleTimes().AndReturn(True)
 

diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py
index a968095fa054ad3ea9be1b1c698f58830a1d3e12..c9aacecbca00a43aa79f8a0475d0ba53389f3f15 100644 (file)
--- a/heat/tests/test_instance.py
+++ b/heat/tests/test_instance.py
@@ -15,7 +15,6 @@
 
 import copy
 
-import eventlet
 import mox
 
 from heat.tests.v1_1 import fakes
@@ -223,14 +222,16 @@ class instancesTest(HeatTestCase):
             if server._test_check_iterations > 2:
                 server.status = 'ACTIVE'
         return_server.get = activate_status.__get__(return_server)
-        self.m.StubOutWithMock(eventlet, 'sleep')
-        eventlet.sleep(1).AndReturn(None)
-        eventlet.sleep(1).AndReturn(None)
+        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)()
         self.assertEqual(instance.state, instance.CREATE_COMPLETE)
 
+        self.m.VerifyAll()
+
     def test_build_nics(self):
         return_server = self.fc.servers.list()[1]
         instance = self._create_test_instance(return_server,

diff --git a/heat/tests/test_instance_group.py b/heat/tests/test_instance_group.py
index 0e6316e0826a7e8f04f948f02c9b5d2142330bd8..e643cbfcf7706d7b8d7a900b3d167afbf1e62529 100644 (file)
--- a/heat/tests/test_instance_group.py
+++ b/heat/tests/test_instance_group.py
@@ -14,7 +14,6 @@
 
 import copy
 
-import eventlet
 import mox
 
 from heat.common import exception
@@ -63,7 +62,7 @@ class InstanceGroupTest(HeatTestCase):
         setup_dummy_db()
 
     def _stub_create(self, num):
-        self.m.StubOutWithMock(eventlet, 'sleep')
+        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
 
         self.m.StubOutWithMock(instance.Instance, 'handle_create')
         self.m.StubOutWithMock(instance.Instance, 'check_create_complete')
@@ -71,7 +70,7 @@ class InstanceGroupTest(HeatTestCase):
         for x in range(num):
             instance.Instance.handle_create().AndReturn(cookie)
         instance.Instance.check_create_complete(cookie).AndReturn(False)
-        eventlet.sleep(mox.IsA(int)).AndReturn(None)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         instance.Instance.check_create_complete(
             cookie).MultipleTimes().AndReturn(True)
 

diff --git a/heat/tests/test_metadata_refresh.py b/heat/tests/test_metadata_refresh.py
index b9f0e9d8c844f8813e6e4a0d586c0e5433a5df9f..c985df8128af9b8bc897e3154155077f7e958018 100644 (file)
--- a/heat/tests/test_metadata_refresh.py
+++ b/heat/tests/test_metadata_refresh.py
@@ -13,7 +13,6 @@
 #    under the License.
 
 
-import eventlet
 import mox
 
 from oslo.config import cfg
@@ -25,6 +24,7 @@ from heat.tests.utils import stack_delete_after
 from heat.common import identifier
 from heat.common import template_format
 from heat.engine import parser
+from heat.engine import scheduler
 from heat.engine import service
 from heat.engine.resources import instance
 from heat.common import context
@@ -124,7 +124,7 @@ class MetadataRefreshTest(HeatTestCase):
     '''
     def setUp(self):
         super(MetadataRefreshTest, self).setUp()
-        self.m.StubOutWithMock(eventlet, 'sleep')
+        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
         self.fc = fakes.FakeKeystoneClient()
         setup_dummy_db()
 
@@ -215,7 +215,7 @@ class WaitCondMetadataUpdateTest(HeatTestCase):
         self.m.StubOutWithMock(wc.WaitConditionHandle, 'identifier')
         wc.WaitConditionHandle.identifier().MultipleTimes().AndReturn(id)
 
-        self.m.StubOutWithMock(eventlet, 'sleep')
+        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
 
         return stack
 
@@ -248,8 +248,8 @@ class WaitCondMetadataUpdateTest(HeatTestCase):
         def post_success(sleep_time):
             update_metadata('123', 'foo', 'bar')
 
-        eventlet.sleep(mox.IsA(int)).WithSideEffects(check_empty)
-        eventlet.sleep(mox.IsA(int)).WithSideEffects(post_success)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).WithSideEffects(check_empty)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).WithSideEffects(post_success)
 
         self.m.ReplayAll()
         self.stack.create()

diff --git a/heat/tests/test_waitcondition.py b/heat/tests/test_waitcondition.py
index aeeaf29360aa4c15abbcbdc7530ee43c6f40fd2c..9e26e067760eff3660916a6ae557123b04adb7bc 100644 (file)
--- a/heat/tests/test_waitcondition.py
+++ b/heat/tests/test_waitcondition.py
@@ -19,7 +19,6 @@ import time
 import json
 import uuid
 
-import eventlet
 from oslo.config import cfg
 
 from heat.tests.common import HeatTestCase
@@ -87,7 +86,7 @@ class WaitConditionTest(HeatTestCase):
         setup_dummy_db()
         self.m.StubOutWithMock(wc.WaitConditionHandle,
                                'get_status')
-        self.m.StubOutWithMock(eventlet, 'sleep')
+        self.m.StubOutWithMock(scheduler.TaskRunner, '_sleep')
 
         cfg.CONF.set_default('heat_waitcondition_server_url',
                              'http://127.0.0.1:8000/v1/waitcondition')
@@ -125,9 +124,9 @@ class WaitConditionTest(HeatTestCase):
     def test_post_success_to_handle(self):
         self.stack = self.create_stack()
         wc.WaitConditionHandle.get_status().AndReturn([])
-        eventlet.sleep(1).AndReturn(None)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn([])
-        eventlet.sleep(1).AndReturn(None)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn(['SUCCESS'])
 
         self.m.ReplayAll()
@@ -147,9 +146,9 @@ class WaitConditionTest(HeatTestCase):
     def test_post_failure_to_handle(self):
         self.stack = self.create_stack()
         wc.WaitConditionHandle.get_status().AndReturn([])
-        eventlet.sleep(1).AndReturn(None)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn([])
-        eventlet.sleep(1).AndReturn(None)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn(['FAILURE'])
 
         self.m.ReplayAll()
@@ -170,11 +169,11 @@ 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([])
-        eventlet.sleep(1).AndReturn(None)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn(['SUCCESS'])
-        eventlet.sleep(1).AndReturn(None)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn(['SUCCESS', 'SUCCESS'])
-        eventlet.sleep(1).AndReturn(None)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn(['SUCCESS', 'SUCCESS',
                                                        'SUCCESS'])
 
@@ -195,9 +194,9 @@ 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([])
-        eventlet.sleep(1).AndReturn(None)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn(['SUCCESS'])
-        eventlet.sleep(1).AndReturn(None)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         wc.WaitConditionHandle.get_status().AndReturn(['SUCCESS', 'FAILURE'])
 
         self.m.ReplayAll()
@@ -226,10 +225,10 @@ class WaitConditionTest(HeatTestCase):
         scheduler.wallclock().AndReturn(st + 0.001)
         scheduler.wallclock().AndReturn(st + 0.1)
         wc.WaitConditionHandle.get_status().AndReturn([])
-        eventlet.sleep(mox.IsA(int)).AndReturn(None)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         scheduler.wallclock().AndReturn(st + 4.1)
         wc.WaitConditionHandle.get_status().AndReturn([])
-        eventlet.sleep(mox.IsA(int)).AndReturn(None)
+        scheduler.TaskRunner._sleep(mox.IsA(int)).AndReturn(None)
         scheduler.wallclock().AndReturn(st + 5.1)
 
         self.m.ReplayAll()