diff options
| author | Vladyslav Drok <vdrok@mirantis.com> | 2019-11-20 15:41:18 +0100 |
|---|---|---|
| committer | Vladyslav Drok <vdrok@mirantis.com> | 2019-11-20 17:52:33 +0100 |
| commit | 68a5e31a54ab06caae7d45a788e4276b42529a24 (patch) | |
| tree | 0b911d76ef67d81b2ca50e450629dd6ef584d9d6 /ironic/tests/unit/drivers/modules/irmc | |
| parent | 306aaccca6f47b986c725b02fba16c4a414eacbc (diff) | |
| download | ironic-68a5e31a54ab06caae7d45a788e4276b42529a24.tar.gz | |
Mock out the correct greenthread sleep method
It seems at some point oslo_service loopingcall started using
eventletutils from oslo_utils to sleep during the loopingcall
retries, and some untittests started taking up to 40 seconds
to complete. This change mocks out the correct method offering
significant speedup to unittests' run time.
The EventletEvent class is introduced to eventletutils in version
3.38.0 so lower constraints are bumped as well.
Change-Id: Id7e6ff2a4748b5301e2259acdc760ac7f56b96c3
Diffstat (limited to 'ironic/tests/unit/drivers/modules/irmc')
| -rw-r--r-- | ironic/tests/unit/drivers/modules/irmc/test_power.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ironic/tests/unit/drivers/modules/irmc/test_power.py b/ironic/tests/unit/drivers/modules/irmc/test_power.py index 66dbb4e66..dfc112c8c 100644 --- a/ironic/tests/unit/drivers/modules/irmc/test_power.py +++ b/ironic/tests/unit/drivers/modules/irmc/test_power.py @@ -50,7 +50,8 @@ class IRMCPowerInternalMethodsTestCase(test_common.BaseIRMCTest): self.assertFalse(irmc_power._is_expected_power_state( target_state, boot_status_value)) - @mock.patch('eventlet.greenthread.sleep', lambda n: None) + @mock.patch('oslo_utils.eventletutils.EventletEvent.wait', + lambda *args, **kwargs: None) @mock.patch('ironic.drivers.modules.irmc.power.snmp.SNMPClient', spec_set=True, autospec=True) def test__wait_power_state_soft_power_off(self, snmpclient_mock): @@ -69,7 +70,8 @@ class IRMCPowerInternalMethodsTestCase(test_common.BaseIRMCTest): self.assertEqual(states.POWER_OFF, task.node.power_state) self.assertEqual(states.NOSTATE, task.node.target_power_state) - @mock.patch('eventlet.greenthread.sleep', lambda n: None) + @mock.patch('oslo_utils.eventletutils.EventletEvent.wait', + lambda *args, **kwargs: None) @mock.patch('ironic.drivers.modules.irmc.power.snmp.SNMPClient', spec_set=True, autospec=True) def test__wait_power_state_soft_reboot(self, snmpclient_mock): @@ -88,7 +90,8 @@ class IRMCPowerInternalMethodsTestCase(test_common.BaseIRMCTest): self.assertEqual(states.POWER_ON, task.node.power_state) self.assertEqual(states.NOSTATE, task.node.target_power_state) - @mock.patch('eventlet.greenthread.sleep', lambda n: None) + @mock.patch('oslo_utils.eventletutils.EventletEvent.wait', + lambda *args, **kwargs: None) @mock.patch('ironic.drivers.modules.irmc.power.snmp.SNMPClient', spec_set=True, autospec=True) def test__wait_power_state_timeout(self, snmpclient_mock): |