72c501454e
The mock module has been added to Python 3.3 as unittest.mock. The third party mock module doesn't seem to be maintained anymore: the last commit was in April 2013. unittest.mock is more recent, has less bugs and is compatible with Python 3.4. There are bugs on Python 3 in the third party mock module, examples: * https://code.google.com/p/mock/issues/detail?id=225 * https://code.google.com/p/mock/issues/detail?id=234 Oslo Messaging hits these issues when running tests on Python 3.4. Import oslotest to setup six.moves for mock. Change-Id: Ic160101695cea67eb9bbbfcaddb8d3dac64e6804
27 lines
925 B
Python
27 lines
925 B
Python
# 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.
|
|
|
|
# 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()
|