openstack
/
cinder
Code Issues Proposed changes

Merge "Tests: Don't sleep for looping calls (eqlx)"

This commit is contained in:
Jenkins 2015-02-03 19:17:58 +00:00 committed by Gerrit Code Review
parent e6519f227f 3f70f6f34f
commit aa1d3754b1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cinder/tests/test_eqlx.py
View File

@ -13,9 +13,9 @@
# License for the specific language governing permissions and limitations
# under the License.
import random
import time
from eventlet import greenthread
import mock
import mox
from oslo_concurrency import processutils
@ -324,8 +324,9 @@ class DellEQLSanISCSIDriverTestCase(test.TestCase):
self.assertRaises(processutils.ProcessExecutionError,
self.driver._ssh_execute, ssh, cmd)
def test_ensure_retries(self):
num_attempts = random.randint(1, 5)
@mock.patch.object(greenthread, 'sleep')
def test_ensure_retries(self, _gt_sleep):
num_attempts = 3
self.driver.configuration.eqlx_cli_max_retries = num_attempts
self.mock_object(self.driver, '_ssh_execute',
@ -348,9 +349,9 @@ class DellEQLSanISCSIDriverTestCase(test.TestCase):
self.assertEqual(num_attempts + 1,
self.driver._ssh_execute.call_count)
def test_ensure_retries_on_channel_timeout(self):
num_attempts = random.randint(1, 5)
@mock.patch.object(greenthread, 'sleep')
def test_ensure_retries_on_channel_timeout(self, _gt_sleep):
num_attempts = 3
self.driver.configuration.eqlx_cli_max_retries = num_attempts
# mocks for calls and objects in _run_ssh