diff --git a/tests/requirements.txt b/tests/requirements.txt index 6a91ea46..c8b4f880 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,5 +1,5 @@ coveralls -mock +mock; python_version < '3.3' pytest pytest-cov pytest-xdist diff --git a/tests/test_forwarder.py b/tests/test_forwarder.py index 40662d08..b5734ab1 100644 --- a/tests/test_forwarder.py +++ b/tests/test_forwarder.py @@ -14,12 +14,16 @@ from functools import partial from contextlib import contextmanager -import mock import paramiko import sshtunnel import shutil import tempfile +try: + from unittest import mock +except ImportError: + import mock + if sys.version_info[0] == 2: from cStringIO import StringIO if sys.version_info < (2, 7):