openstack
/
oslo.messaging
Code Issues Proposed changes

Merge "tests: cleanup monkey path"

This commit is contained in:
Jenkins 2017-01-12 15:48:40 +00:00 committed by Gerrit Code Review
parent 492ffe9774 d64d05f3e0
commit 9f2b59c957
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
# 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()