diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-25 22:59:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-25 22:59:21 +0000 |
| commit | 132616aaf2e17148a1c357f58729d8e6015e121f (patch) | |
| tree | 8a0e6e0d79688d4596b8ac5d92013a704f1aa91a | |
| parent | acd440ec54ce8075f3313108d047881eacb92739 (diff) | |
| parent | 1c1ea473b07790e1a0279fb208bcedfcd6be9d82 (diff) | |
| download | ironic-132616aaf2e17148a1c357f58729d8e6015e121f.tar.gz | |
Merge "Speed up ironic tests"
| -rw-r--r-- | ironic/tests/drivers/test_ipmitool.py | 3 | ||||
| -rw-r--r-- | ironic/tests/drivers/test_pxe.py | 2 | ||||
| -rw-r--r-- | ironic/tests/drivers/test_seamicro.py | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/ironic/tests/drivers/test_ipmitool.py b/ironic/tests/drivers/test_ipmitool.py index c98cf7969..6248827c1 100644 --- a/ironic/tests/drivers/test_ipmitool.py +++ b/ironic/tests/drivers/test_ipmitool.py @@ -239,7 +239,8 @@ class IPMIToolPrivateMethodTestCase(base.TestCase): self.info) mock_exec.assert_called_once_with(self.info, "power status") - def test__power_on_max_retries(self): + @mock.patch('eventlet.greenthread.sleep') + def test__power_on_max_retries(self, sleep_mock): self.config(retry_timeout=2, group='ipmi') def side_effect(driver_info, command): diff --git a/ironic/tests/drivers/test_pxe.py b/ironic/tests/drivers/test_pxe.py index 846d7be8b..0ae6b98c7 100644 --- a/ironic/tests/drivers/test_pxe.py +++ b/ironic/tests/drivers/test_pxe.py @@ -238,7 +238,7 @@ class PXEValidateParametersTestCase(base.TestCase): self.lock_file = lock_file def run(self): - time.sleep(2) + time.sleep(0.2) open(os.path.join(master_path, 'node_uuid'), 'w').close() pxe._remove_download_in_progress_lock(self.lock_file) diff --git a/ironic/tests/drivers/test_seamicro.py b/ironic/tests/drivers/test_seamicro.py index a1aa064a6..1af9f8059 100644 --- a/ironic/tests/drivers/test_seamicro.py +++ b/ironic/tests/drivers/test_seamicro.py @@ -144,6 +144,9 @@ class SeaMicroPrivateMethodsTestCase(base.TestCase): 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() + def _create_test_node(self, **kwargs): n = db_utils.get_test_node(**kwargs) return self.dbapi.create_node(n) |