chore: Use stdlib unittest.mock instead of separate mock library. Res…

…olves googleapis#1055
clundin25 · Jul 25, 2023 · 9b26950 · 9b26950
1 parent a4135a3
commit 9b26950
Show file tree

Hide file tree

Showing 45 changed files with 45 additions and 44 deletions.
diff --git a/system_tests/secrets.tar.enc b/system_tests/secrets.tar.enc
diff --git a/system_tests/system_tests_sync/test_mtls_http.py b/system_tests/system_tests_sync/test_mtls_http.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import json
-import mock
+from unittest import mock
 import os
 import time
 from os import path

diff --git a/testing/requirements.txt b/testing/requirements.txt
@@ -1,7 +1,6 @@
 # Unit test requirements
 flask
 freezegun
-mock
 oauth2client
 pyopenssl
 pytest

diff --git a/tests/compute_engine/test__metadata.py b/tests/compute_engine/test__metadata.py
@@ -17,8 +17,8 @@
 import importlib
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _helpers

diff --git a/tests/compute_engine/test_credentials.py b/tests/compute_engine/test_credentials.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 import base64
 import datetime
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 import responses # type: ignore
 

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -14,8 +14,8 @@
 
 import os
 import sys
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 

diff --git a/tests/crypt/test__python_rsa.py b/tests/crypt/test__python_rsa.py
@@ -15,8 +15,8 @@
 import io
 import json
 import os
+from unittest import mock
 
-import mock
 from pyasn1_modules import pem # type: ignore
 import pytest # type: ignore
 import rsa # type: ignore

diff --git a/tests/oauth2/test__client.py b/tests/oauth2/test__client.py
@@ -16,9 +16,9 @@
 import http.client as http_client
 import json
 import os
+from unittest import mock
 import urllib
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _helpers

diff --git a/tests/oauth2/test_challenges.py b/tests/oauth2/test_challenges.py
@@ -16,8 +16,8 @@
 
 import base64
 import sys
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 import pyu2f # type: ignore
 

diff --git a/tests/oauth2/test_credentials.py b/tests/oauth2/test_credentials.py
@@ -17,8 +17,8 @@
 import os
 import pickle
 import sys
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _helpers

diff --git a/tests/oauth2/test_gdch_credentials.py b/tests/oauth2/test_gdch_credentials.py
@@ -16,8 +16,8 @@
 import datetime
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 import requests
 

diff --git a/tests/oauth2/test_id_token.py b/tests/oauth2/test_id_token.py
@@ -14,8 +14,8 @@
 
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import environment_vars

diff --git a/tests/oauth2/test_reauth.py b/tests/oauth2/test_reauth.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import copy
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import exceptions

diff --git a/tests/oauth2/test_service_account.py b/tests/oauth2/test_service_account.py
@@ -15,8 +15,8 @@
 import datetime
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _helpers

diff --git a/tests/oauth2/test_sts.py b/tests/oauth2/test_sts.py
@@ -14,9 +14,9 @@
 
 import http.client as http_client
 import json
+from unittest import mock
 import urllib
 
-import mock
 import pytest # type: ignore
 
 from google.auth import exceptions

diff --git a/tests/test__cloud_sdk.py b/tests/test__cloud_sdk.py
@@ -17,8 +17,8 @@
 import os
 import subprocess
 import sys
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _cloud_sdk

diff --git a/tests/test__default.py b/tests/test__default.py
@@ -14,8 +14,8 @@
 
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _default

diff --git a/tests/test__exponential_backoff.py b/tests/test__exponential_backoff.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from google.auth import _exponential_backoff
 

diff --git a/tests/test__oauth2client.py b/tests/test__oauth2client.py
@@ -16,8 +16,8 @@
 import importlib
 import os
 import sys
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 try:

diff --git a/tests/test_app_engine.py b/tests/test_app_engine.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import datetime
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import app_engine

diff --git a/tests/test_aws.py b/tests/test_aws.py
@@ -16,9 +16,9 @@
 import http.client as http_client
 import json
 import os
+from unittest import mock
 import urllib.parse
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _helpers

diff --git a/tests/test_downscoped.py b/tests/test_downscoped.py
@@ -15,9 +15,9 @@
 import datetime
 import http.client as http_client
 import json
+from unittest import mock
 import urllib
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _helpers

diff --git a/tests/test_external_account.py b/tests/test_external_account.py
@@ -15,9 +15,9 @@
 import datetime
 import http.client as http_client
 import json
+from unittest import mock
 import urllib
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _helpers

diff --git a/tests/test_external_account_authorized_user.py b/tests/test_external_account_authorized_user.py
@@ -15,8 +15,8 @@
 import datetime
 import http.client as http_client
 import json
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import exceptions

diff --git a/tests/test_iam.py b/tests/test_iam.py
@@ -16,8 +16,8 @@
 import datetime
 import http.client as http_client
 import json
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _helpers

diff --git a/tests/test_identity_pool.py b/tests/test_identity_pool.py
@@ -16,9 +16,9 @@
 import http.client as http_client
 import json
 import os
+from unittest import mock
 import urllib
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _helpers

diff --git a/tests/test_impersonated_credentials.py b/tests/test_impersonated_credentials.py
@@ -16,8 +16,8 @@
 import http.client as http_client
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _helpers

diff --git a/tests/test_jwt.py b/tests/test_jwt.py
@@ -16,8 +16,8 @@
 import datetime
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _helpers

diff --git a/tests/test_metrics.py b/tests/test_metrics.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 import platform
+from unittest import mock
 
-import mock
 
 from google.auth import metrics
 from google.auth import version

diff --git a/tests/test_pluggable.py b/tests/test_pluggable.py
@@ -15,8 +15,8 @@
 import json
 import os
 import subprocess
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import exceptions

diff --git a/tests/transport/test__custom_tls_signer.py b/tests/transport/test__custom_tls_signer.py
@@ -15,8 +15,8 @@
 import base64
 import ctypes
 import os
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 from requests.packages.urllib3.util.ssl_ import create_urllib3_context # type: ignore
 import urllib3.contrib.pyopenssl # type: ignore

diff --git a/tests/transport/test__mtls_helper.py b/tests/transport/test__mtls_helper.py
@@ -14,8 +14,8 @@
 
 import os
 import re
+from unittest import mock
 
-import mock
 from OpenSSL import crypto
 import pytest # type: ignore
 

diff --git a/tests/transport/test_grpc.py b/tests/transport/test_grpc.py
@@ -15,8 +15,8 @@
 import datetime
 import os
 import time
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _helpers

diff --git a/tests/transport/test_mtls.py b/tests/transport/test_mtls.py
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
+
 import pytest # type: ignore
 
 from google.auth import exceptions

diff --git a/tests/transport/test_requests.py b/tests/transport/test_requests.py
@@ -17,9 +17,9 @@
 import http.client as http_client
 import os
 import sys
+from unittest import mock
 
 import freezegun
-import mock
 import OpenSSL
 import pytest # type: ignore
 import requests

diff --git a/tests/transport/test_urllib3.py b/tests/transport/test_urllib3.py
@@ -15,8 +15,8 @@
 import http.client as http_client
 import os
 import sys
+from unittest import mock
 
-import mock
 import OpenSSL
 import pytest # type: ignore
 import urllib3 # type: ignore

diff --git a/tests_async/conftest.py b/tests_async/conftest.py
@@ -14,8 +14,8 @@
 
 import os
 import sys
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 

diff --git a/tests_async/oauth2/test__client_async.py b/tests_async/oauth2/test__client_async.py
@@ -15,9 +15,9 @@
 import datetime
 import http.client as http_client
 import json
+from unittest import mock
 import urllib
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _helpers

diff --git a/tests_async/oauth2/test_credentials_async.py b/tests_async/oauth2/test_credentials_async.py
@@ -17,8 +17,8 @@
 import os
 import pickle
 import sys
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import _helpers

diff --git a/tests_async/oauth2/test_id_token.py b/tests_async/oauth2/test_id_token.py
@@ -14,8 +14,8 @@
 
 import json
 import os
+from unittest import mock
 
-import mock
 import pytest # type: ignore
 
 from google.auth import environment_vars