From bc8675afb067c517cbe5ee1129aad080282bd7c4 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 12 Jan 2015 16:58:32 +0000 Subject: [PATCH] fix qpid test issue with eventlet monkey patching Tests now ensure that eventlet monkey patching is enabled before importing the qpid module, otherwise qpid will hang. Currently, qpid randomly hangs, depending on the order of the Python module import, which probably depends on the local file modification time. Closes-Bug: #1409899 Change-Id: I516c580faef04f55fcc095d22adbfabcfa001da7 --- tests/__init__.py | 22 ++++++++++++++++++++++ tests/drivers/test_impl_zmq.py | 4 ---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/tests/__init__.py b/tests/__init__.py index 8b1378917..31e79b810 100644 --- a/tests/__init__.py +++ b/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() diff --git a/tests/drivers/test_impl_zmq.py b/tests/drivers/test_impl_zmq.py index 0f63d891b..30277c93a 100644 --- a/tests/drivers/test_impl_zmq.py +++ b/tests/drivers/test_impl_zmq.py @@ -24,12 +24,8 @@ from oslo import messaging from oslo.utils import importutils from oslo_messaging.tests import utils as test_utils -# NOTE(jamespage) the zmq driver implementation is currently tied -# 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')