2023-03-15 15:34:28 +01:00
|
|
|
---
|
|
|
|
tests/compute_engine/test__metadata.py | 2 +-
|
|
|
|
tests/compute_engine/test_credentials.py | 2 +-
|
|
|
|
tests/conftest.py | 2 +-
|
|
|
|
tests/crypt/test__python_rsa.py | 2 +-
|
|
|
|
tests/oauth2/test__client.py | 2 +-
|
|
|
|
tests/oauth2/test_challenges.py | 2 +-
|
|
|
|
tests/oauth2/test_credentials.py | 2 +-
|
|
|
|
tests/oauth2/test_gdch_credentials.py | 2 +-
|
|
|
|
tests/oauth2/test_id_token.py | 2 +-
|
|
|
|
tests/oauth2/test_reauth.py | 2 +-
|
|
|
|
tests/oauth2/test_service_account.py | 2 +-
|
|
|
|
tests/oauth2/test_sts.py | 2 +-
|
|
|
|
tests/test__cloud_sdk.py | 2 +-
|
|
|
|
tests/test__default.py | 2 +-
|
|
|
|
tests/test__exponential_backoff.py | 2 +-
|
|
|
|
tests/test__oauth2client.py | 2 +-
|
|
|
|
tests/test_app_engine.py | 2 +-
|
|
|
|
tests/test_aws.py | 2 +-
|
|
|
|
tests/test_downscoped.py | 2 +-
|
|
|
|
tests/test_external_account.py | 2 +-
|
|
|
|
tests/test_external_account_authorized_user.py | 2 +-
|
|
|
|
tests/test_iam.py | 2 +-
|
|
|
|
tests/test_identity_pool.py | 2 +-
|
|
|
|
tests/test_impersonated_credentials.py | 2 +-
|
|
|
|
tests/test_jwt.py | 2 +-
|
|
|
|
tests/test_pluggable.py | 2 +-
|
|
|
|
tests/transport/test__custom_tls_signer.py | 2 +-
|
|
|
|
tests/transport/test__mtls_helper.py | 2 +-
|
|
|
|
tests/transport/test_grpc.py | 2 +-
|
|
|
|
tests/transport/test_mtls.py | 2 +-
|
|
|
|
tests/transport/test_requests.py | 2 +-
|
|
|
|
tests/transport/test_urllib3.py | 2 +-
|
|
|
|
32 files changed, 32 insertions(+), 32 deletions(-)
|
|
|
|
|
|
|
|
--- a/tests/compute_engine/test__metadata.py
|
|
|
|
+++ b/tests/compute_engine/test__metadata.py
|
|
|
|
@@ -16,7 +16,7 @@ import datetime
|
|
|
|
import json
|
|
|
|
import os
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
from six.moves import http_client
|
|
|
|
from six.moves import reload_module
|
|
|
|
--- a/tests/compute_engine/test_credentials.py
|
|
|
|
+++ b/tests/compute_engine/test_credentials.py
|
2022-06-08 11:45:48 +02:00
|
|
|
@@ -14,7 +14,7 @@
|
|
|
|
import base64
|
|
|
|
import datetime
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
import responses # type: ignore
|
|
|
|
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/conftest.py
|
|
|
|
+++ b/tests/conftest.py
|
2022-06-08 11:45:48 +02:00
|
|
|
@@ -15,7 +15,7 @@
|
|
|
|
import os
|
|
|
|
import sys
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
|
|
|
|
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/crypt/test__python_rsa.py
|
|
|
|
+++ b/tests/crypt/test__python_rsa.py
|
2022-06-08 11:45:48 +02:00
|
|
|
@@ -15,7 +15,7 @@
|
|
|
|
import json
|
|
|
|
import os
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
from pyasn1_modules import pem # type: ignore
|
|
|
|
import pytest # type: ignore
|
|
|
|
import rsa # type: ignore
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/oauth2/test__client.py
|
|
|
|
+++ b/tests/oauth2/test__client.py
|
|
|
|
@@ -16,7 +16,7 @@ import datetime
|
|
|
|
import json
|
|
|
|
import os
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
import six
|
|
|
|
from six.moves import http_client
|
|
|
|
--- a/tests/oauth2/test_challenges.py
|
|
|
|
+++ b/tests/oauth2/test_challenges.py
|
2022-06-08 11:45:48 +02:00
|
|
|
@@ -17,7 +17,7 @@
|
|
|
|
import base64
|
|
|
|
import sys
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
import pyu2f # type: ignore
|
|
|
|
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/oauth2/test_credentials.py
|
|
|
|
+++ b/tests/oauth2/test_credentials.py
|
|
|
|
@@ -18,7 +18,7 @@ import os
|
2022-06-08 11:45:48 +02:00
|
|
|
import pickle
|
|
|
|
import sys
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
|
|
|
|
from google.auth import _helpers
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/oauth2/test_gdch_credentials.py
|
|
|
|
+++ b/tests/oauth2/test_gdch_credentials.py
|
|
|
|
@@ -17,7 +17,7 @@ import datetime
|
2022-09-08 17:39:55 +02:00
|
|
|
import json
|
|
|
|
import os
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
import requests
|
|
|
|
import six
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/oauth2/test_id_token.py
|
|
|
|
+++ b/tests/oauth2/test_id_token.py
|
2022-06-08 11:45:48 +02:00
|
|
|
@@ -15,7 +15,7 @@
|
|
|
|
import json
|
|
|
|
import os
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
|
|
|
|
from google.auth import environment_vars
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/oauth2/test_reauth.py
|
|
|
|
+++ b/tests/oauth2/test_reauth.py
|
2022-06-08 11:45:48 +02:00
|
|
|
@@ -14,7 +14,7 @@
|
|
|
|
|
|
|
|
import copy
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
|
|
|
|
from google.auth import exceptions
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/oauth2/test_service_account.py
|
|
|
|
+++ b/tests/oauth2/test_service_account.py
|
|
|
|
@@ -16,7 +16,7 @@ import datetime
|
2022-06-08 11:45:48 +02:00
|
|
|
import json
|
|
|
|
import os
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
|
|
|
|
from google.auth import _helpers
|
|
|
|
from google.auth import crypt
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/oauth2/test_sts.py
|
|
|
|
+++ b/tests/oauth2/test_sts.py
|
2022-06-08 11:45:48 +02:00
|
|
|
@@ -14,7 +14,7 @@
|
|
|
|
|
|
|
|
import json
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
from six.moves import http_client
|
|
|
|
from six.moves import urllib
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/test__cloud_sdk.py
|
|
|
|
+++ b/tests/test__cloud_sdk.py
|
|
|
|
@@ -17,7 +17,7 @@ import json
|
|
|
|
import os
|
|
|
|
import subprocess
|
2022-06-08 11:45:48 +02:00
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
|
2023-03-15 15:34:28 +01:00
|
|
|
from google.auth import _cloud_sdk
|
|
|
|
--- a/tests/test__default.py
|
|
|
|
+++ b/tests/test__default.py
|
|
|
|
@@ -15,7 +15,7 @@
|
2022-06-08 11:45:48 +02:00
|
|
|
import json
|
2023-02-22 21:10:17 +01:00
|
|
|
import os
|
2022-06-08 11:45:48 +02:00
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
2023-03-15 15:34:28 +01:00
|
|
|
|
|
|
|
from google.auth import _default
|
|
|
|
--- 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.
|
2022-06-08 11:45:48 +02:00
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
|
2023-03-15 15:34:28 +01:00
|
|
|
from google.auth import _exponential_backoff
|
|
|
|
|
|
|
|
--- a/tests/test__oauth2client.py
|
|
|
|
+++ b/tests/test__oauth2client.py
|
|
|
|
@@ -16,7 +16,7 @@ import datetime
|
2023-03-03 10:27:50 +01:00
|
|
|
import os
|
2023-03-15 15:34:28 +01:00
|
|
|
import sys
|
2022-06-08 11:45:48 +02:00
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
2023-03-15 15:34:28 +01:00
|
|
|
from six.moves import reload_module
|
|
|
|
|
|
|
|
--- a/tests/test_app_engine.py
|
|
|
|
+++ b/tests/test_app_engine.py
|
|
|
|
@@ -14,7 +14,7 @@
|
2022-06-08 11:45:48 +02:00
|
|
|
|
|
|
|
import datetime
|
2023-03-15 15:34:28 +01:00
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
|
|
|
|
from google.auth import app_engine
|
|
|
|
--- a/tests/test_aws.py
|
|
|
|
+++ b/tests/test_aws.py
|
|
|
|
@@ -16,7 +16,7 @@ import datetime
|
2022-06-08 11:45:48 +02:00
|
|
|
import json
|
2023-03-15 15:34:28 +01:00
|
|
|
import os
|
2022-06-08 11:45:48 +02:00
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
from six.moves import http_client
|
|
|
|
from six.moves import urllib
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/test_downscoped.py
|
|
|
|
+++ b/tests/test_downscoped.py
|
|
|
|
@@ -15,7 +15,7 @@
|
|
|
|
import datetime
|
|
|
|
import json
|
2022-10-14 14:17:32 +02:00
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
2023-03-15 15:34:28 +01:00
|
|
|
import pytest # type: ignore
|
|
|
|
from six.moves import http_client
|
|
|
|
from six.moves import urllib
|
|
|
|
--- a/tests/test_external_account.py
|
|
|
|
+++ b/tests/test_external_account.py
|
2022-11-08 08:13:30 +01:00
|
|
|
@@ -15,7 +15,7 @@
|
|
|
|
import datetime
|
|
|
|
import json
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
from six.moves import http_client
|
2023-03-15 15:34:28 +01:00
|
|
|
from six.moves import urllib
|
|
|
|
--- a/tests/test_external_account_authorized_user.py
|
|
|
|
+++ b/tests/test_external_account_authorized_user.py
|
2022-06-08 11:45:48 +02:00
|
|
|
@@ -15,7 +15,7 @@
|
|
|
|
import datetime
|
|
|
|
import json
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
from six.moves import http_client
|
2023-03-15 15:34:28 +01:00
|
|
|
|
|
|
|
--- a/tests/test_iam.py
|
|
|
|
+++ b/tests/test_iam.py
|
|
|
|
@@ -16,7 +16,7 @@ import base64
|
2022-06-08 11:45:48 +02:00
|
|
|
import datetime
|
|
|
|
import json
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
from six.moves import http_client
|
|
|
|
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/test_identity_pool.py
|
|
|
|
+++ b/tests/test_identity_pool.py
|
|
|
|
@@ -16,7 +16,7 @@ import datetime
|
2022-06-08 11:45:48 +02:00
|
|
|
import json
|
|
|
|
import os
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
from six.moves import http_client
|
|
|
|
from six.moves import urllib
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/test_impersonated_credentials.py
|
|
|
|
+++ b/tests/test_impersonated_credentials.py
|
|
|
|
@@ -19,7 +19,7 @@ import os
|
2022-06-08 11:45:48 +02:00
|
|
|
# Because Python 2.7
|
|
|
|
# from typing import List
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
from six.moves import http_client
|
|
|
|
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/test_jwt.py
|
|
|
|
+++ b/tests/test_jwt.py
|
|
|
|
@@ -17,7 +17,7 @@ import datetime
|
2022-06-08 11:45:48 +02:00
|
|
|
import json
|
|
|
|
import os
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
|
|
|
|
from google.auth import _helpers
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/test_pluggable.py
|
|
|
|
+++ b/tests/test_pluggable.py
|
|
|
|
@@ -17,7 +17,7 @@ import json
|
2022-09-08 17:39:55 +02:00
|
|
|
import os
|
|
|
|
import subprocess
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
|
|
|
|
# from six.moves import http_client
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/transport/test__custom_tls_signer.py
|
|
|
|
+++ b/tests/transport/test__custom_tls_signer.py
|
|
|
|
@@ -16,7 +16,7 @@ import base64
|
2022-06-08 11:45:48 +02:00
|
|
|
import ctypes
|
|
|
|
import os
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
from requests.packages.urllib3.util.ssl_ import create_urllib3_context # type: ignore
|
|
|
|
import urllib3.contrib.pyopenssl # type: ignore
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/transport/test__mtls_helper.py
|
|
|
|
+++ b/tests/transport/test__mtls_helper.py
|
|
|
|
@@ -15,7 +15,7 @@
|
2022-06-08 11:45:48 +02:00
|
|
|
import os
|
2023-03-15 15:34:28 +01:00
|
|
|
import re
|
2022-06-08 11:45:48 +02:00
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
2023-03-15 15:34:28 +01:00
|
|
|
from OpenSSL import crypto
|
2022-06-08 11:45:48 +02:00
|
|
|
import pytest # type: ignore
|
|
|
|
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/transport/test_grpc.py
|
|
|
|
+++ b/tests/transport/test_grpc.py
|
|
|
|
@@ -16,7 +16,7 @@ import datetime
|
2022-06-08 11:45:48 +02:00
|
|
|
import os
|
2023-03-15 15:34:28 +01:00
|
|
|
import time
|
2022-06-08 11:45:48 +02:00
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import pytest # type: ignore
|
|
|
|
|
2023-03-15 15:34:28 +01:00
|
|
|
from google.auth import _helpers
|
|
|
|
--- a/tests/transport/test_mtls.py
|
|
|
|
+++ b/tests/transport/test_mtls.py
|
2022-06-08 11:45:48 +02:00
|
|
|
@@ -12,7 +12,7 @@
|
|
|
|
# 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
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/transport/test_requests.py
|
|
|
|
+++ b/tests/transport/test_requests.py
|
|
|
|
@@ -18,7 +18,7 @@ import os
|
2022-06-08 11:45:48 +02:00
|
|
|
import sys
|
|
|
|
|
|
|
|
import freezegun
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import OpenSSL
|
|
|
|
import pytest # type: ignore
|
|
|
|
import requests
|
2023-03-15 15:34:28 +01:00
|
|
|
--- a/tests/transport/test_urllib3.py
|
|
|
|
+++ b/tests/transport/test_urllib3.py
|
2022-06-08 11:45:48 +02:00
|
|
|
@@ -15,7 +15,7 @@
|
|
|
|
import os
|
|
|
|
import sys
|
|
|
|
|
|
|
|
-import mock
|
|
|
|
+from unittest import mock
|
|
|
|
import OpenSSL
|
|
|
|
import pytest # type: ignore
|
|
|
|
from six.moves import http_client
|