diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-04-07 23:53:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-04-07 23:53:04 +0000 |
| commit | 331dc7f01aa6121d10a63604d2ed149267e84088 (patch) | |
| tree | c95dbf0912e448f9573218671aa20faea1dce822 | |
| parent | 9d1909c508ecc2396753475e381102e6dee1e521 (diff) | |
| parent | 3a4e6b5b814348e7851ab002ae8e4c1b8a543909 (diff) | |
| download | heat-cfntools-331dc7f01aa6121d10a63604d2ed149267e84088.tar.gz | |
Merge "Switch over to mox3"
| -rw-r--r-- | heat_cfntools/tests/test_cfn_helper.py | 2 | ||||
| -rw-r--r-- | heat_cfntools/tests/test_cfn_hup.py | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/heat_cfntools/tests/test_cfn_helper.py b/heat_cfntools/tests/test_cfn_helper.py index a661014..9a0d8e1 100644 --- a/heat_cfntools/tests/test_cfn_helper.py +++ b/heat_cfntools/tests/test_cfn_helper.py @@ -17,7 +17,7 @@ import boto.cloudformation as cfn import fixtures import json -import mox +from mox3 import mox import os import subprocess import tempfile diff --git a/heat_cfntools/tests/test_cfn_hup.py b/heat_cfntools/tests/test_cfn_hup.py index 3ebd671..d548760 100644 --- a/heat_cfntools/tests/test_cfn_hup.py +++ b/heat_cfntools/tests/test_cfn_hup.py @@ -14,7 +14,7 @@ # under the License. import fixtures -import mox +from mox3 import mox import tempfile import testtools diff --git a/test-requirements.txt b/test-requirements.txt index 7528079..d523570 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,7 @@ # Hacking already pins down pep8, pyflakes and flake8 hacking>=0.8.0,<0.9 -mox>=0.5.3 +mox3>=0.7.0 discover testrepository>=0.0.17 testtools>=0.9.32 |