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
This commit is contained in:
parent
8d2331a3b7
commit
d64d05f3e0
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user