diff --git a/tests/ansible/tests/connection_test.py b/tests/ansible/tests/connection_test.py index 0ade6994..649f8b65 100644 --- a/tests/ansible/tests/connection_test.py +++ b/tests/ansible/tests/connection_test.py @@ -2,7 +2,11 @@ from __future__ import absolute_import import os import tempfile -import mock +try: + from unittest import mock +except ImportError: + import mock + import ansible.errors import ansible.playbook.play_context diff --git a/tests/ansible/tests/target_test.py b/tests/ansible/tests/target_test.py index 0e588baa..806175ed 100644 --- a/tests/ansible/tests/target_test.py +++ b/tests/ansible/tests/target_test.py @@ -4,7 +4,10 @@ import subprocess import tempfile import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock import ansible_mitogen.target import testlib diff --git a/tests/broker_test.py b/tests/broker_test.py index d58d9480..41b95387 100644 --- a/tests/broker_test.py +++ b/tests/broker_test.py @@ -1,4 +1,7 @@ -import mock +try: + from unittest import mock +except ImportError: + import mock import testlib diff --git a/tests/importer_test.py b/tests/importer_test.py index e86af8af..33aafe93 100644 --- a/tests/importer_test.py +++ b/tests/importer_test.py @@ -4,7 +4,10 @@ import types import zlib import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock import mitogen.core import mitogen.utils diff --git a/tests/io_op_test.py b/tests/io_op_test.py index 55adfa11..e0ad65f1 100644 --- a/tests/io_op_test.py +++ b/tests/io_op_test.py @@ -1,7 +1,10 @@ import errno import select -import mock +try: + from unittest import mock +except ImportError: + import mock import testlib import mitogen.core diff --git a/tests/log_handler_test.py b/tests/log_handler_test.py index 43b986cb..da929426 100644 --- a/tests/log_handler_test.py +++ b/tests/log_handler_test.py @@ -1,8 +1,12 @@ import logging -import mock import sys import unittest +try: + from unittest import mock +except ImportError: + import mock + import testlib import mitogen.core import mitogen.master diff --git a/tests/message_test.py b/tests/message_test.py index 2d2299d1..fc50a327 100644 --- a/tests/message_test.py +++ b/tests/message_test.py @@ -2,7 +2,10 @@ import sys import struct import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock import mitogen.core import mitogen.master diff --git a/tests/mitogen_protocol_test.py b/tests/mitogen_protocol_test.py index d6e3cc95..46a0cd65 100644 --- a/tests/mitogen_protocol_test.py +++ b/tests/mitogen_protocol_test.py @@ -1,4 +1,7 @@ -import mock +try: + from unittest import mock +except ImportError: + import mock import mitogen.core diff --git a/tests/parent_test.py b/tests/parent_test.py index fa7e4fb7..558a89b6 100644 --- a/tests/parent_test.py +++ b/tests/parent_test.py @@ -6,7 +6,10 @@ import sys import time import unittest -import mock +try: + from unittest import mock +except ImportError: + import mock import testlib import mitogen.core diff --git a/tests/policy_function_test.py b/tests/policy_function_test.py index 843f8b7c..77bd17d1 100644 --- a/tests/policy_function_test.py +++ b/tests/policy_function_test.py @@ -1,4 +1,7 @@ -import mock +try: + from unittest import mock +except ImportError: + import mock import mitogen.core import mitogen.parent diff --git a/tests/reaper_test.py b/tests/reaper_test.py index b60b13a4..8588a1bc 100644 --- a/tests/reaper_test.py +++ b/tests/reaper_test.py @@ -1,7 +1,10 @@ import signal import testlib -import mock +try: + from unittest import mock +except ImportError: + import mock import mitogen.parent diff --git a/tests/responder_test.py b/tests/responder_test.py index 1131b421..d1e65816 100644 --- a/tests/responder_test.py +++ b/tests/responder_test.py @@ -1,9 +1,13 @@ -import mock import textwrap import subprocess import sys import unittest +try: + from unittest import mock +except ImportError: + import mock + import mitogen.master import testlib diff --git a/tests/timer_test.py b/tests/timer_test.py index dac4d7df..f8f203a9 100644 --- a/tests/timer_test.py +++ b/tests/timer_test.py @@ -1,4 +1,7 @@ -import mock +try: + from unittest import mock +except ImportError: + import mock import mitogen.core import mitogen.parent