forked from pool/python-google-auth
Matej Cepl
8fde43a32b
- Update to 2.14.0 * Add token_info_url to external account credentials (#1168) * Read Quota Project from Environment Variable (#1163) * Adding more properties to external_account_authorized_user (#1169) - from version 2.13.0 * Adds new external account authorized user credentials (#1160) * Implement pluggable auth interactive mode (#1131) * Introduce the functionality to override token_uri in credentials (#1159) * Adding one more pattern to relax the regex check for sts and impersonation url endpoints (#1158) - Refresh patches for new version * python-google-auth-no-mock.patch OBS-URL: https://build.opensuse.org/request/show/1034209 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-google-auth?expand=0&rev=45
385 lines
14 KiB
Diff
385 lines
14 KiB
Diff
diff -Nru google-auth-2.14.0.orig/tests/compute_engine/test_credentials.py google-auth-2.14.0/tests/compute_engine/test_credentials.py
|
|
--- google-auth-2.14.0.orig/tests/compute_engine/test_credentials.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/compute_engine/test_credentials.py 2022-11-07 14:57:21.675761110 +0100
|
|
@@ -14,7 +14,7 @@
|
|
import base64
|
|
import datetime
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
import responses # type: ignore
|
|
|
|
diff -Nru google-auth-2.14.0.orig/tests/compute_engine/test__metadata.py google-auth-2.14.0/tests/compute_engine/test__metadata.py
|
|
--- google-auth-2.14.0.orig/tests/compute_engine/test__metadata.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/compute_engine/test__metadata.py 2022-11-07 14:57:21.679761142 +0100
|
|
@@ -16,7 +16,7 @@
|
|
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
|
|
diff -Nru google-auth-2.14.0.orig/tests/conftest.py google-auth-2.14.0/tests/conftest.py
|
|
--- google-auth-2.14.0.orig/tests/conftest.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/conftest.py 2022-11-07 14:57:21.603760535 +0100
|
|
@@ -15,7 +15,7 @@
|
|
import os
|
|
import sys
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
|
|
|
|
diff -Nru google-auth-2.14.0.orig/tests/crypt/test__python_rsa.py google-auth-2.14.0/tests/crypt/test__python_rsa.py
|
|
--- google-auth-2.14.0.orig/tests/crypt/test__python_rsa.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/crypt/test__python_rsa.py 2022-11-07 14:57:21.703761334 +0100
|
|
@@ -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
|
|
diff -Nru google-auth-2.14.0.orig/tests/oauth2/test_challenges.py google-auth-2.14.0/tests/oauth2/test_challenges.py
|
|
--- google-auth-2.14.0.orig/tests/oauth2/test_challenges.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/oauth2/test_challenges.py 2022-11-07 14:57:21.659760982 +0100
|
|
@@ -17,7 +17,7 @@
|
|
import base64
|
|
import sys
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
import pyu2f # type: ignore
|
|
|
|
diff -Nru google-auth-2.14.0.orig/tests/oauth2/test__client.py google-auth-2.14.0/tests/oauth2/test__client.py
|
|
--- google-auth-2.14.0.orig/tests/oauth2/test__client.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/oauth2/test__client.py 2022-11-07 14:57:21.643760854 +0100
|
|
@@ -16,7 +16,7 @@
|
|
import json
|
|
import os
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
import six
|
|
from six.moves import http_client
|
|
diff -Nru google-auth-2.14.0.orig/tests/oauth2/test_credentials.py google-auth-2.14.0/tests/oauth2/test_credentials.py
|
|
--- google-auth-2.14.0.orig/tests/oauth2/test_credentials.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/oauth2/test_credentials.py 2022-11-07 14:57:21.651760918 +0100
|
|
@@ -18,7 +18,7 @@
|
|
import pickle
|
|
import sys
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
|
|
from google.auth import _helpers
|
|
diff -Nru google-auth-2.14.0.orig/tests/oauth2/test_gdch_credentials.py google-auth-2.14.0/tests/oauth2/test_gdch_credentials.py
|
|
--- google-auth-2.14.0.orig/tests/oauth2/test_gdch_credentials.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/oauth2/test_gdch_credentials.py 2022-11-07 14:57:21.639760822 +0100
|
|
@@ -17,7 +17,7 @@
|
|
import json
|
|
import os
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
import requests
|
|
import six
|
|
diff -Nru google-auth-2.14.0.orig/tests/oauth2/test_id_token.py google-auth-2.14.0/tests/oauth2/test_id_token.py
|
|
--- google-auth-2.14.0.orig/tests/oauth2/test_id_token.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/oauth2/test_id_token.py 2022-11-07 14:57:21.643760854 +0100
|
|
@@ -15,7 +15,7 @@
|
|
import json
|
|
import os
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
|
|
from google.auth import environment_vars
|
|
diff -Nru google-auth-2.14.0.orig/tests/oauth2/test_reauth.py google-auth-2.14.0/tests/oauth2/test_reauth.py
|
|
--- google-auth-2.14.0.orig/tests/oauth2/test_reauth.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/oauth2/test_reauth.py 2022-11-07 14:57:21.651760918 +0100
|
|
@@ -14,7 +14,7 @@
|
|
|
|
import copy
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
|
|
from google.auth import exceptions
|
|
diff -Nru google-auth-2.14.0.orig/tests/oauth2/test_service_account.py google-auth-2.14.0/tests/oauth2/test_service_account.py
|
|
--- google-auth-2.14.0.orig/tests/oauth2/test_service_account.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/oauth2/test_service_account.py 2022-11-07 14:57:21.647760886 +0100
|
|
@@ -16,7 +16,7 @@
|
|
import json
|
|
import os
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
|
|
from google.auth import _helpers
|
|
from google.auth import crypt
|
|
diff -Nru google-auth-2.14.0.orig/tests/oauth2/test_sts.py google-auth-2.14.0/tests/oauth2/test_sts.py
|
|
--- google-auth-2.14.0.orig/tests/oauth2/test_sts.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/oauth2/test_sts.py 2022-11-07 14:57:21.659760982 +0100
|
|
@@ -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
|
|
diff -Nru google-auth-2.14.0.orig/tests/test_app_engine.py google-auth-2.14.0/tests/test_app_engine.py
|
|
--- google-auth-2.14.0.orig/tests/test_app_engine.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/test_app_engine.py 2022-11-07 14:57:21.627760726 +0100
|
|
@@ -14,7 +14,7 @@
|
|
|
|
import datetime
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
|
|
from google.auth import app_engine
|
|
diff -Nru google-auth-2.14.0.orig/tests/test_aws.py google-auth-2.14.0/tests/test_aws.py
|
|
--- google-auth-2.14.0.orig/tests/test_aws.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/test_aws.py 2022-11-07 14:57:21.715761429 +0100
|
|
@@ -15,7 +15,7 @@
|
|
import datetime
|
|
import json
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
from six.moves import http_client
|
|
from six.moves import urllib
|
|
diff -Nru google-auth-2.14.0.orig/tests/test__cloud_sdk.py google-auth-2.14.0/tests/test__cloud_sdk.py
|
|
--- google-auth-2.14.0.orig/tests/test__cloud_sdk.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/test__cloud_sdk.py 2022-11-07 14:57:21.635760790 +0100
|
|
@@ -17,7 +17,7 @@
|
|
import os
|
|
import subprocess
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
|
|
from google.auth import _cloud_sdk
|
|
diff -Nru google-auth-2.14.0.orig/tests/test__default.py google-auth-2.14.0/tests/test__default.py
|
|
--- google-auth-2.14.0.orig/tests/test__default.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/test__default.py 2022-11-07 14:57:21.667761046 +0100
|
|
@@ -15,7 +15,7 @@
|
|
import json
|
|
import os
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
|
|
from google.auth import _default
|
|
diff -Nru google-auth-2.14.0.orig/tests/test_downscoped.py google-auth-2.14.0/tests/test_downscoped.py
|
|
--- google-auth-2.14.0.orig/tests/test_downscoped.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/test_downscoped.py 2022-11-07 14:57:21.675761110 +0100
|
|
@@ -15,7 +15,7 @@
|
|
import datetime
|
|
import json
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
from six.moves import http_client
|
|
from six.moves import urllib
|
|
diff -Nru google-auth-2.14.0.orig/tests/test__exponential_backoff.py google-auth-2.14.0/tests/test__exponential_backoff.py
|
|
--- google-auth-2.14.0.orig/tests/test__exponential_backoff.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/test__exponential_backoff.py 2022-11-07 14:57:21.595760471 +0100
|
|
@@ -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 -Nru google-auth-2.14.0.orig/tests/test_external_account_authorized_user.py google-auth-2.14.0/tests/test_external_account_authorized_user.py
|
|
--- google-auth-2.14.0.orig/tests/test_external_account_authorized_user.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/test_external_account_authorized_user.py 2022-11-07 14:57:21.671761078 +0100
|
|
@@ -15,7 +15,7 @@
|
|
import datetime
|
|
import json
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
from six.moves import http_client
|
|
|
|
diff -Nru google-auth-2.14.0.orig/tests/test_external_account.py google-auth-2.14.0/tests/test_external_account.py
|
|
--- google-auth-2.14.0.orig/tests/test_external_account.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/test_external_account.py 2022-11-07 14:57:21.599760503 +0100
|
|
@@ -15,7 +15,7 @@
|
|
import datetime
|
|
import json
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
from six.moves import http_client
|
|
from six.moves import urllib
|
|
diff -Nru google-auth-2.14.0.orig/tests/test_iam.py google-auth-2.14.0/tests/test_iam.py
|
|
--- google-auth-2.14.0.orig/tests/test_iam.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/test_iam.py 2022-11-07 14:57:21.683761174 +0100
|
|
@@ -16,7 +16,7 @@
|
|
import datetime
|
|
import json
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
from six.moves import http_client
|
|
|
|
diff -Nru google-auth-2.14.0.orig/tests/test_identity_pool.py google-auth-2.14.0/tests/test_identity_pool.py
|
|
--- google-auth-2.14.0.orig/tests/test_identity_pool.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/test_identity_pool.py 2022-11-07 14:57:21.687761206 +0100
|
|
@@ -16,7 +16,7 @@
|
|
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
|
|
diff -Nru google-auth-2.14.0.orig/tests/test_impersonated_credentials.py google-auth-2.14.0/tests/test_impersonated_credentials.py
|
|
--- google-auth-2.14.0.orig/tests/test_impersonated_credentials.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/test_impersonated_credentials.py 2022-11-07 14:57:21.707761366 +0100
|
|
@@ -19,7 +19,7 @@
|
|
# Because Python 2.7
|
|
# from typing import List
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
from six.moves import http_client
|
|
|
|
diff -Nru google-auth-2.14.0.orig/tests/test_jwt.py google-auth-2.14.0/tests/test_jwt.py
|
|
--- google-auth-2.14.0.orig/tests/test_jwt.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/test_jwt.py 2022-11-07 14:57:21.691761238 +0100
|
|
@@ -17,7 +17,7 @@
|
|
import json
|
|
import os
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
|
|
from google.auth import _helpers
|
|
diff -Nru google-auth-2.14.0.orig/tests/test__oauth2client.py google-auth-2.14.0/tests/test__oauth2client.py
|
|
--- google-auth-2.14.0.orig/tests/test__oauth2client.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/test__oauth2client.py 2022-11-07 14:57:21.631760758 +0100
|
|
@@ -16,7 +16,7 @@
|
|
import os
|
|
import sys
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
from six.moves import reload_module
|
|
|
|
diff -Nru google-auth-2.14.0.orig/tests/test_pluggable.py google-auth-2.14.0/tests/test_pluggable.py
|
|
--- google-auth-2.14.0.orig/tests/test_pluggable.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/test_pluggable.py 2022-11-07 14:57:21.711761397 +0100
|
|
@@ -17,7 +17,7 @@
|
|
import os
|
|
import subprocess
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
|
|
# from six.moves import http_client
|
|
diff -Nru google-auth-2.14.0.orig/tests/transport/test__custom_tls_signer.py google-auth-2.14.0/tests/transport/test__custom_tls_signer.py
|
|
--- google-auth-2.14.0.orig/tests/transport/test__custom_tls_signer.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/transport/test__custom_tls_signer.py 2022-11-07 14:57:21.607760567 +0100
|
|
@@ -16,7 +16,7 @@
|
|
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
|
|
diff -Nru google-auth-2.14.0.orig/tests/transport/test_grpc.py google-auth-2.14.0/tests/transport/test_grpc.py
|
|
--- google-auth-2.14.0.orig/tests/transport/test_grpc.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/transport/test_grpc.py 2022-11-07 14:57:21.611760599 +0100
|
|
@@ -16,7 +16,7 @@
|
|
import os
|
|
import time
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
|
|
from google.auth import _helpers
|
|
diff -Nru google-auth-2.14.0.orig/tests/transport/test__mtls_helper.py google-auth-2.14.0/tests/transport/test__mtls_helper.py
|
|
--- google-auth-2.14.0.orig/tests/transport/test__mtls_helper.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/transport/test__mtls_helper.py 2022-11-07 14:57:21.615760631 +0100
|
|
@@ -15,7 +15,7 @@
|
|
import os
|
|
import re
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
from OpenSSL import crypto
|
|
import pytest # type: ignore
|
|
|
|
diff -Nru google-auth-2.14.0.orig/tests/transport/test_mtls.py google-auth-2.14.0/tests/transport/test_mtls.py
|
|
--- google-auth-2.14.0.orig/tests/transport/test_mtls.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/transport/test_mtls.py 2022-11-07 14:57:21.619760663 +0100
|
|
@@ -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
|
|
diff -Nru google-auth-2.14.0.orig/tests/transport/test_requests.py google-auth-2.14.0/tests/transport/test_requests.py
|
|
--- google-auth-2.14.0.orig/tests/transport/test_requests.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/transport/test_requests.py 2022-11-07 14:57:21.619760663 +0100
|
|
@@ -18,7 +18,7 @@
|
|
import sys
|
|
|
|
import freezegun
|
|
-import mock
|
|
+from unittest import mock
|
|
import OpenSSL
|
|
import pytest # type: ignore
|
|
import requests
|
|
diff -Nru google-auth-2.14.0.orig/tests/transport/test_urllib3.py google-auth-2.14.0/tests/transport/test_urllib3.py
|
|
--- google-auth-2.14.0.orig/tests/transport/test_urllib3.py 2022-10-31 22:49:50.000000000 +0100
|
|
+++ google-auth-2.14.0/tests/transport/test_urllib3.py 2022-11-07 14:57:21.603760535 +0100
|
|
@@ -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
|