diff --git a/tests/test_datacontainer.py b/tests/test_datacontainer.py index c3a0962..4f46dc9 100644 --- a/tests/test_datacontainer.py +++ b/tests/test_datacontainer.py @@ -3,12 +3,15 @@ """ import configobj import pytest -import mock import unittest import time try: import simplejson as json except ImportError: import json import socket +try: + from unittest import mock +except ImportError: + import mock import sys import os diff --git a/tests/test_memory_leak.py b/tests/test_memory_leak.py index 12408bb..1b591e5 100644 --- a/tests/test_memory_leak.py +++ b/tests/test_memory_leak.py @@ -3,8 +3,11 @@ """ import configobj import pytest -import mock import unittest +try: + from unittest import mock +except ImportError: + import mock import resource import sys diff --git a/tests/test_sampleprobe.py b/tests/test_sampleprobe.py index 8cf696a..0e9b138 100644 --- a/tests/test_sampleprobe.py +++ b/tests/test_sampleprobe.py @@ -3,9 +3,12 @@ """ import configobj import pytest -import mock import unittest import socket +try: + from unittest import mock +except ImportError: + import mock import resource import time diff --git a/tests/test_senderprotocol.py b/tests/test_senderprotocol.py index 11987b4..1b0e877 100644 --- a/tests/test_senderprotocol.py +++ b/tests/test_senderprotocol.py @@ -3,12 +3,15 @@ """ import configobj import pytest -import mock import unittest import time try: import simplejson as json except ImportError: import json import socket +try: + from unittest import mock +except ImportError: + import mock import sys import os diff --git a/tests/test_zabbixagentconfig.py b/tests/test_zabbixagentconfig.py index de3f9dc..b5844a0 100644 --- a/tests/test_zabbixagentconfig.py +++ b/tests/test_zabbixagentconfig.py @@ -3,9 +3,12 @@ """ import configobj import pytest -import mock import unittest import logging +try: + from unittest import mock +except ImportError: + import mock import sys import os