openstack/oslo.messaging
Code Issues Proposed changes

tests: cleanup monkey path

Browse Source 
This change makes the monkeypatching the first thing to do.
It removes the try/except since the tests requires eventlet.

Change-Id: Ic6bbe303d7f4a606212b46add2fa51ce14c569ae
This commit is contained in:
Mehdi Abaakouk 2017-01-10 18:23:22 +01:00
parent 8d2331a3b7
commit d64d05f3e0
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oslo_messaging/tests/__init__.py
View File

@ -13,14 +13,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import eventlet
eventlet.monkey_patch()
# Import oslotest before importing test submodules to setup six.moves for mock # Import oslotest before importing test submodules to setup six.moves for mock
import oslotest import oslotest
try:
import eventlet
except ImportError:
pass
else:
# Ensure that eventlet monkey patching is enabled before loading the qpid
# module, otherwise qpid will hang
eventlet.monkey_patch()