openstack
/
keystone
Code Issues Proposed changes

Merge "Reduces the amount of mocked imports for Python 3"

This commit is contained in:
Jenkins 2014-07-22 21:42:33 +00:00 committed by Gerrit Code Review
parent 746c52e21f 03d7e662af
commit 6db884c4e3
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
keystone/tests/__init__.py
View File

@ -25,16 +25,10 @@ if six.PY3:
import sys
from unittest import mock # noqa: our import detection is naive?
# NOTE(dstanek): oslo.config is imported there so that later module
# that use it will still have access. If we don't import it now then
# it won't be available because of how I am patching oslo below.
import oslo.config # noqa: need this imported before the monkey patching
import oslo.db # noqa: need this imported before the monkey patching
sys.modules['eventlet'] = mock.Mock()
sys.modules['eventlet.green'] = mock.Mock()
sys.modules['eventlet.wsgi'] = mock.Mock()
sys.modules['oslo'] = mock.Mock()
sys.modules['oslo.messaging'] = mock.Mock()
sys.modules['oslo'].messaging = mock.Mock()
sys.modules['pycadf'] = mock.Mock()
sys.modules['paste'] = mock.Mock()