From d64d05f3e07f08518faf83c6684da47998535678 Mon Sep 17 00:00:00 2001
From: Mehdi Abaakouk <sileht@redhat.com>
Date: Tue, 10 Jan 2017 18:23:22 +0100
Subject: [PATCH] tests: cleanup monkey path

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

Change-Id: Ic6bbe303d7f4a606212b46add2fa51ce14c569ae
---
 oslo_messaging/tests/__init__.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/oslo_messaging/tests/__init__.py b/oslo_messaging/tests/__init__.py
index 0222c4e76..25e8f9721 100644
--- a/oslo_messaging/tests/__init__.py
+++ b/oslo_messaging/tests/__init__.py
@@ -13,14 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import eventlet
+eventlet.monkey_patch()
+
 # Import oslotest before importing test submodules to setup six.moves for mock
 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()