From 4bb99311e2911406dde543117438782a9524feea Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Mon, 11 Oct 2021 22:50:39 +0300 Subject: [PATCH] Don't install mock backport Signed-off-by: Hugo van Kemenade --- test-requirements.txt | 1 - tests/integration/credentials/utils_test.py | 6 +----- tests/unit/api_container_test.py | 6 +----- tests/unit/api_image_test.py | 6 +----- tests/unit/api_network_test.py | 6 +----- tests/unit/api_test.py | 6 +----- tests/unit/auth_test.py | 7 +------ tests/unit/client_test.py | 6 +----- tests/unit/dockertypes_test.py | 6 +----- tests/unit/fake_api_client.py | 6 +----- tests/unit/utils_config_test.py | 6 +----- 11 files changed, 10 insertions(+), 52 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index d135792b..ccc97be4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,6 @@ setuptools==58.2.0 coverage==6.0.1 flake8==4.0.1 -mock==1.0.1 pytest==6.2.5 pytest-cov==3.0.0 pytest-timeout==2.0.1 diff --git a/tests/integration/credentials/utils_test.py b/tests/integration/credentials/utils_test.py index d7b2a1a4..acf018d2 100644 --- a/tests/integration/credentials/utils_test.py +++ b/tests/integration/credentials/utils_test.py @@ -1,11 +1,7 @@ import os from docker.credentials.utils import create_environment_dict - -try: - from unittest import mock -except ImportError: - from unittest import mock +from unittest import mock @mock.patch.dict(os.environ) diff --git a/tests/unit/api_container_test.py b/tests/unit/api_container_test.py index 1ebd37df..a66aea04 100644 --- a/tests/unit/api_container_test.py +++ b/tests/unit/api_container_test.py @@ -4,6 +4,7 @@ import signal import docker from docker.api import APIClient +from unittest import mock import pytest from . import fake_api @@ -13,11 +14,6 @@ from .api_test import ( fake_inspect_container, url_base ) -try: - from unittest import mock -except ImportError: - from unittest import mock - def fake_inspect_container_tty(self, container): return fake_inspect_container(self, container, tty=True) diff --git a/tests/unit/api_image_test.py b/tests/unit/api_image_test.py index 843c11b8..8fb3e9d9 100644 --- a/tests/unit/api_image_test.py +++ b/tests/unit/api_image_test.py @@ -3,16 +3,12 @@ import pytest from . import fake_api from docker import auth +from unittest import mock from .api_test import ( BaseAPIClientTest, fake_request, DEFAULT_TIMEOUT_SECONDS, url_prefix, fake_resolve_authconfig ) -try: - from unittest import mock -except ImportError: - from unittest import mock - class ImageTest(BaseAPIClientTest): def test_image_viz(self): diff --git a/tests/unit/api_network_test.py b/tests/unit/api_network_test.py index 84d65449..8afab737 100644 --- a/tests/unit/api_network_test.py +++ b/tests/unit/api_network_test.py @@ -2,11 +2,7 @@ import json from .api_test import BaseAPIClientTest, url_prefix, response from docker.types import IPAMConfig, IPAMPool - -try: - from unittest import mock -except ImportError: - from unittest import mock +from unittest import mock class NetworkTest(BaseAPIClientTest): diff --git a/tests/unit/api_test.py b/tests/unit/api_test.py index dfc38164..3234e55b 100644 --- a/tests/unit/api_test.py +++ b/tests/unit/api_test.py @@ -19,14 +19,10 @@ import requests from docker.api import APIClient from docker.constants import DEFAULT_DOCKER_API_VERSION from requests.packages import urllib3 +from unittest import mock from . import fake_api -try: - from unittest import mock -except ImportError: - from unittest import mock - DEFAULT_TIMEOUT_SECONDS = docker.constants.DEFAULT_TIMEOUT_SECONDS diff --git a/tests/unit/auth_test.py b/tests/unit/auth_test.py index 8bd2e165..ea953af0 100644 --- a/tests/unit/auth_test.py +++ b/tests/unit/auth_test.py @@ -8,14 +8,9 @@ import tempfile import unittest from docker import auth, credentials, errors +from unittest import mock import pytest -try: - from unittest import mock -except ImportError: - from unittest import mock - - class RegressionTest(unittest.TestCase): def test_803_urlsafe_encode(self): auth_data = { diff --git a/tests/unit/client_test.py b/tests/unit/client_test.py index d647d3a1..e7c7eec8 100644 --- a/tests/unit/client_test.py +++ b/tests/unit/client_test.py @@ -9,14 +9,10 @@ from docker.constants import ( DEFAULT_MAX_POOL_SIZE, IS_WINDOWS_PLATFORM ) from docker.utils import kwargs_from_env +from unittest import mock from . import fake_api -try: - from unittest import mock -except ImportError: - from unittest import mock - TEST_CERT_DIR = os.path.join(os.path.dirname(__file__), 'testdata/certs') POOL_SIZE = 20 diff --git a/tests/unit/dockertypes_test.py b/tests/unit/dockertypes_test.py index a0a171be..76a99a62 100644 --- a/tests/unit/dockertypes_test.py +++ b/tests/unit/dockertypes_test.py @@ -9,11 +9,7 @@ from docker.types import ( IPAMPool, LogConfig, Mount, ServiceMode, Ulimit, ) from docker.types.services import convert_service_ports - -try: - from unittest import mock -except: # noqa: E722 - from unittest import mock +from unittest import mock def create_host_config(*args, **kwargs): diff --git a/tests/unit/fake_api_client.py b/tests/unit/fake_api_client.py index 1663ef12..95cf63b4 100644 --- a/tests/unit/fake_api_client.py +++ b/tests/unit/fake_api_client.py @@ -2,13 +2,9 @@ import copy import docker from docker.constants import DEFAULT_DOCKER_API_VERSION +from unittest import mock from . import fake_api -try: - from unittest import mock -except ImportError: - from unittest import mock - class CopyReturnMagicMock(mock.MagicMock): """ diff --git a/tests/unit/utils_config_test.py b/tests/unit/utils_config_test.py index 83e04a14..27d5a7cd 100644 --- a/tests/unit/utils_config_test.py +++ b/tests/unit/utils_config_test.py @@ -5,14 +5,10 @@ import tempfile import json from pytest import mark, fixture +from unittest import mock from docker.utils import config -try: - from unittest import mock -except ImportError: - from unittest import mock - class FindConfigFileTest(unittest.TestCase):