summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-13 09:28:06 +0000
committerGerrit Code Review <review@openstack.org>2015-04-13 09:28:06 +0000
commit3c1e1c7ed32474640c495a6b1bbdfbda5d65acc7 (patch)
tree58f6c1d13cbadcbaf4a693ec8f8d0dddeaa28d7b
parentaa2cf65e4db36184e538885656f98e753fa6a768 (diff)
parent0543ef81ef1544cda647bc8db82965639808fb33 (diff)
downloadironic-3c1e1c7ed32474640c495a6b1bbdfbda5d65acc7.tar.gz
Merge "Use mock patch decorator for eventlet.greenthread.sleep"
-rw-r--r--ironic/tests/drivers/test_seamicro.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/ironic/tests/drivers/test_seamicro.py b/ironic/tests/drivers/test_seamicro.py
index ad4586828..e477cddd4 100644
--- a/ironic/tests/drivers/test_seamicro.py
+++ b/ironic/tests/drivers/test_seamicro.py
@@ -129,6 +129,7 @@ class SeaMicroValidateParametersTestCase(db_base.DbTestCase):
node)
+@mock.patch('eventlet.greenthread.sleep', lambda n: None)
class SeaMicroPrivateMethodsTestCase(db_base.DbTestCase):
def setUp(self):
@@ -144,8 +145,6 @@ class SeaMicroPrivateMethodsTestCase(db_base.DbTestCase):
self.config(action_timeout=0, group='seamicro')
self.config(max_retry=2, group='seamicro')
- self.patcher = mock.patch('eventlet.greenthread.sleep')
- self.mock_sleep = self.patcher.start()
self.info = seamicro._parse_driver_info(self.node)
@mock.patch.object(seamicro_client, "Client")