diff --git a/requirements/test.txt b/requirements/test.txt index 2354363..018d1f2 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,4 +4,4 @@ flake8 nose six>=1.4.0 PyYAML -mock +mock; python_version < '3.3' diff --git a/test/test_functional.py b/test/test_functional.py index 5049928..9275ffc 100644 --- a/test/test_functional.py +++ b/test/test_functional.py @@ -2,7 +2,10 @@ import json import six -import mock +try: + from unittest import mock +except ImportError: + import mock from ddt import ddt, data, file_data from nose.tools import ( diff --git a/tox.ini b/tox.ini index da77f04..10b5e0a 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,6 @@ deps = flake8 six>=1.4.0 PyYAML - mock commands = nosetests -s --with-coverage --cover-package=ddt --cover-html flake8 ddt.py test @@ -16,6 +15,7 @@ commands = [testenv:py27] deps = {[testenv]deps} + mock Sphinx sphinxcontrib-programoutput commands =