diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-04-09 18:37:13 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-04-09 18:37:13 +0000 |
commit | 453d5e422625936a33d067fb99a4378444054744 (patch) | |
tree | 0b6b5d36756e35907b1025380bebe5fc743a8f7f /ironic/tests/drivers | |
parent | e7aaca3bd25b2faa99d851dda980a705998677b8 (diff) | |
parent | cc4ec8bd2eb689cf14d8f0ba7d742751b4100688 (diff) | |
download | ironic-453d5e422625936a33d067fb99a4378444054744.tar.gz |
Merge "Follow-up to "Add retry logic to _exec_ipmitool""
Diffstat (limited to 'ironic/tests/drivers')
-rw-r--r-- | ironic/tests/drivers/test_ipmitool.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ironic/tests/drivers/test_ipmitool.py b/ironic/tests/drivers/test_ipmitool.py index 0828f2c60..2e0097fba 100644 --- a/ironic/tests/drivers/test_ipmitool.py +++ b/ironic/tests/drivers/test_ipmitool.py @@ -891,21 +891,21 @@ class IPMIToolPrivateMethodTestCase(db_base.DbTestCase): @mock.patch.object(ipmi, '_is_option_supported', autospec=True) @mock.patch.object(utils, 'execute', autospec=True) - def test__exec_ipmitool_exception_retry_failure_unhandable(self, + def test__exec_ipmitool_exception_non_retryable_failure(self, mock_exec, mock_support, mock_sleep): ipmi.LAST_CMD_TIME = {} mock_support.return_value = False - # Return a retryable error, then a error that cannot - # be retryable thus resulting in a single retry - # attempt by _exec_ipmitool that is successful. + # Return a retryable error, then an error that cannot + # be retried thus resulting in a single retry + # attempt by _exec_ipmitool. mock_exec.side_effect = iter([ processutils.ProcessExecutionError( stderr="insufficient resources for session" ), processutils.ProcessExecutionError( - "Unknown" + stderr="Unknown" ), ]) |