From cdfcd61a1d5c5f4d136fd7b5d3a37fbe48d37e6d Mon Sep 17 00:00:00 2001 From: Sirushti Murugesan Date: Mon, 29 Jun 2015 09:05:33 +0530 Subject: [PATCH] Override mox in sys.modules to mox3 in a py3 env partial blueprint heat-python34-support Change-Id: Iabb0435254ce07163f979160b312fc0e5d9e8a97 --- contrib/rackspace/heat_keystoneclient_v2/__init__.py | 7 +++++++ contrib/rackspace/rackspace/tests/__init__.py | 7 +++++++ heat/tests/__init__.py | 7 +++++++ test-requirements.txt | 1 + 4 files changed, 22 insertions(+) diff --git a/contrib/rackspace/heat_keystoneclient_v2/__init__.py b/contrib/rackspace/heat_keystoneclient_v2/__init__.py index e69de29bb2..eef3ce7e7c 100644 --- a/contrib/rackspace/heat_keystoneclient_v2/__init__.py +++ b/contrib/rackspace/heat_keystoneclient_v2/__init__.py @@ -0,0 +1,7 @@ +import six + + +if six.PY3: + from mox3 import mox + import sys + sys.modules['mox'] = mox diff --git a/contrib/rackspace/rackspace/tests/__init__.py b/contrib/rackspace/rackspace/tests/__init__.py index e69de29bb2..eef3ce7e7c 100644 --- a/contrib/rackspace/rackspace/tests/__init__.py +++ b/contrib/rackspace/rackspace/tests/__init__.py @@ -0,0 +1,7 @@ +import six + + +if six.PY3: + from mox3 import mox + import sys + sys.modules['mox'] = mox diff --git a/heat/tests/__init__.py b/heat/tests/__init__.py index 5974fcfbf6..8da9ec68a0 100644 --- a/heat/tests/__init__.py +++ b/heat/tests/__init__.py @@ -12,6 +12,13 @@ # under the License. import oslo_i18n as i18n +import six + + +if six.PY3: + from mox3 import mox + import sys + sys.modules['mox'] = mox def fake_translate_msgid(msgid, domain, desired_locale=None): diff --git a/test-requirements.txt b/test-requirements.txt index 0aaf7ce77b..fde3cf22b4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,6 +8,7 @@ coverage>=3.6 discover mock>=1.0 mox>=0.5.3 +mox3>=0.7.0 PyMySQL>=0.6.2 # MIT License oslosphinx>=2.5.0 # Apache-2.0 oslotest>=1.5.1 # Apache-2.0