Merge pull request #9587 from hexagonrecursion/mock

Author: uranusjr

tests/conftest.py

@@ -8,9 +8,9 @@
 import sys
 import time
 from contextlib import contextmanager
+from unittest.mock import patch
 
 import pytest
-from mock import patch
 from pip._vendor.contextlib2 import ExitStack, nullcontext
 from setuptools.wheel import Wheel
 
@@ -550,8 +550,10 @@ def get_requests(self):
         """Get environ for each received request.
         """
         assert not self._running, "cannot get mock from running server"
+        # Legacy: replace call[0][0] with call.args[0]
+        # when pip drops support for python3.7
         return [
-            call.args[0] for call in self._server.mock.call_args_list
+            call[0][0] for call in self._server.mock.call_args_list
         ]
 
 

tests/functional/test_download.py

@@ -850,6 +850,9 @@ def test_download_file_url_existing_bad_download(
 def test_download_http_url_bad_hash(
     shared_script, shared_data, tmpdir, mock_server
 ):
+    """
+    If already-downloaded file has bad checksum, re-download.
+    """
     download_dir = tmpdir / 'download'
     download_dir.mkdir()
     downloaded_path = download_dir / 'simple-1.0.tar.gz'

tests/functional/test_help.py

@@ -1,5 +1,6 @@
+from unittest.mock import Mock
+
 import pytest
-from mock import Mock
 
 from pip._internal.cli.status_codes import ERROR, SUCCESS
 from pip._internal.commands import commands_dict, create_command

tests/functional/test_install.py

@@ -1850,7 +1850,9 @@ def test_install_sends_client_cert(install_args, script, cert_factory, data):
 
     assert server.mock.call_count == 2
     for call_args in server.mock.call_args_list:
-        environ, _ = call_args.args
+        # Legacy: replace call_args[0] with call_args.args
+        # when pip drops support for python3.7
+        environ, _ = call_args[0]
         assert "SSL_CLIENT_CERT" in environ
         assert environ["SSL_CLIENT_CERT"]
 

tests/lib/server.py

@@ -4,8 +4,8 @@
 import threading
 from contextlib import contextmanager
 from textwrap import dedent
+from unittest.mock import Mock
 
-from mock import Mock
 from pip._vendor.contextlib2 import nullcontext
 from werkzeug.serving import WSGIRequestHandler
 from werkzeug.serving import make_server as _make_server

tests/unit/resolution_resolvelib/test_resolver.py

@@ -1,4 +1,5 @@
-import mock
+from unittest import mock
+
 import pytest
 from pip._vendor.packaging.utils import canonicalize_name
 from pip._vendor.resolvelib.resolvers import Result

tests/unit/test_base_command.py

@@ -1,8 +1,8 @@
 import logging
 import os
+from unittest.mock import Mock, patch
 
 import pytest
-from mock import Mock, patch
 
 from pip._internal.cli.base_command import Command
 from pip._internal.cli.status_codes import SUCCESS

tests/unit/test_check.py

@@ -1,7 +1,7 @@
 """Unit Tests for pip's dependency checking logic
 """
 
-import mock
+from unittest import mock
 
 from pip._internal.operations import check
 

tests/unit/test_collector.py

@@ -4,11 +4,11 @@
 import urllib.request
 import uuid
 from textwrap import dedent
+from unittest import mock
+from unittest.mock import Mock, patch
 
-import mock
 import pretend
 import pytest
-from mock import Mock, patch
 from pip._vendor import html5lib, requests
 
 from pip._internal.exceptions import NetworkConnectionError

tests/unit/test_command_install.py

@@ -1,7 +1,7 @@
 import errno
+from unittest.mock import patch
 
 import pytest
-from mock import patch
 from pip._vendor.packaging.requirements import Requirement
 
 from pip._internal.commands.install import (