fix qpid test issue with eventlet monkey patching

I516c580faef04f55fcc095d22adbfabcfa001da7 have been
merged just after the namespace change patch, but change only
the old test directory.

So reapply I516c580faef04f55fcc095d22adbfabcfa001da7 to the
new test directory.

Change-Id: I5cd7d7b6c507967e7fb4744012b2ad215c4f1ad3
Closes-Bug: #1409899

oslo_messaging/tests/__init__.py

@@ -1 +1,23 @@
+# Copyright 2014 eNovance
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
 
+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()

oslo_messaging/tests/drivers/test_impl_zmq.py

@@ -28,8 +28,6 @@ from oslo_messaging.tests import utils as test_utils
 # to eventlet so we have to monkey_patch to support testing
 # eventlet is not yet py3 compatible, so skip if not installed
 eventlet = importutils.try_import('eventlet')
-if eventlet:
-    eventlet.monkey_patch()
 
 impl_zmq = importutils.try_import('oslo_messaging._drivers.impl_zmq')