summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-19 11:14:32 +0000
committerGerrit Code Review <review@openstack.org>2017-06-19 11:14:32 +0000
commit9728815feb123d76ee017f45f0c57d186bda8670 (patch)
tree86fd9d843bc639f575a01712468a0363fd199a4b
parent84b5f71933bd10cc8897a3329577aca7e56bd118 (diff)
parentcf9eeb1a4ef60c224995849ed0d1fad9d8ccf184 (diff)
Merge "Fix slow test_connect_volume_device_not_valid test"
-rw-r--r--os_brick/tests/initiator/connectors/test_fibre_channel.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/os_brick/tests/initiator/connectors/test_fibre_channel.py b/os_brick/tests/initiator/connectors/test_fibre_channel.py
index 1b18633..916a9bd 100644
--- a/os_brick/tests/initiator/connectors/test_fibre_channel.py
+++ b/os_brick/tests/initiator/connectors/test_fibre_channel.py
@@ -417,6 +417,7 @@ class FibreChannelConnectorTestCase(test_connector.ConnectorTestCase):
417 actual = self.connector.get_all_available_volumes() 417 actual = self.connector.get_all_available_volumes()
418 self.assertItemsEqual(expected, actual) 418 self.assertItemsEqual(expected, actual)
419 419
420 @mock.patch('eventlet.greenthread.sleep', mock.Mock())
420 @mock.patch.object(linuxscsi.LinuxSCSI, 'find_multipath_device') 421 @mock.patch.object(linuxscsi.LinuxSCSI, 'find_multipath_device')
421 @mock.patch.object(linuxscsi.LinuxSCSI, 'wait_for_rw') 422 @mock.patch.object(linuxscsi.LinuxSCSI, 'wait_for_rw')
422 @mock.patch.object(os.path, 'exists', return_value=True) 423 @mock.patch.object(os.path, 'exists', return_value=True)