forked from pool/python-google-auth
Markéta Machová
c4cc388532
- Update to 2.11.0 * add integration tests for configurable token lifespan (#1103) * Async certificate retrieving (#1101) - from version 2.10.0 * add integration tests for pluggable auth (#1073) * support for configurable token lifetime (0dc6a9a) * support for configurable token lifetime (#1079) * async certificate decoding (#1085) * Async system tests were not unwrapping async_generators (#1086) * Fix IDTokenCredentials update bug [#1072) * make expiration_time optional in response schema (#1091) * refactor credential subclass parameters (#1095) - from version 2.9.1 * there was a raise missing for throwing exceptions (#1077) - from version 2.9.0 * pluggable auth support (#1045) - from version 2.8.0 * add experimental GDCH support (#1044) - Refresh patches for new version * python-google-auth-no-mock.patch * add experimental enterprise cert support * add experimental GDCH support * Pluggable auth support * validate urls for external accounts * revert experimental GDCH support * fix changelog header to consistent size * silence TypeError during tear down stage * add additional missing import in _default.py * fix missing import in _default.py OBS-URL: https://build.opensuse.org/request/show/1001906 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-google-auth?expand=0&rev=41
361 lines
14 KiB
Diff
361 lines
14 KiB
Diff
diff -Nru google-auth-2.11.0.orig/tests/compute_engine/test_credentials.py google-auth-2.11.0/tests/compute_engine/test_credentials.py
|
|
--- google-auth-2.11.0.orig/tests/compute_engine/test_credentials.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/compute_engine/test_credentials.py 2022-09-08 14:01:15.569972516 +0200
|
|
@@ -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.11.0.orig/tests/compute_engine/test__metadata.py google-auth-2.11.0/tests/compute_engine/test__metadata.py
|
|
--- google-auth-2.11.0.orig/tests/compute_engine/test__metadata.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/compute_engine/test__metadata.py 2022-09-08 14:01:15.569972516 +0200
|
|
@@ -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.11.0.orig/tests/conftest.py google-auth-2.11.0/tests/conftest.py
|
|
--- google-auth-2.11.0.orig/tests/conftest.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/conftest.py 2022-09-08 14:01:15.509971920 +0200
|
|
@@ -15,7 +15,7 @@
|
|
import os
|
|
import sys
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import pytest # type: ignore
|
|
|
|
|
|
diff -Nru google-auth-2.11.0.orig/tests/crypt/test__python_rsa.py google-auth-2.11.0/tests/crypt/test__python_rsa.py
|
|
--- google-auth-2.11.0.orig/tests/crypt/test__python_rsa.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/crypt/test__python_rsa.py 2022-09-08 14:01:15.589972714 +0200
|
|
@@ -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.11.0.orig/tests/oauth2/test_challenges.py google-auth-2.11.0/tests/oauth2/test_challenges.py
|
|
--- google-auth-2.11.0.orig/tests/oauth2/test_challenges.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/oauth2/test_challenges.py 2022-09-08 14:01:15.557972396 +0200
|
|
@@ -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.11.0.orig/tests/oauth2/test__client.py google-auth-2.11.0/tests/oauth2/test__client.py
|
|
--- google-auth-2.11.0.orig/tests/oauth2/test__client.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/oauth2/test__client.py 2022-09-08 14:01:15.549972317 +0200
|
|
@@ -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.11.0.orig/tests/oauth2/test_credentials.py google-auth-2.11.0/tests/oauth2/test_credentials.py
|
|
--- google-auth-2.11.0.orig/tests/oauth2/test_credentials.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/oauth2/test_credentials.py 2022-09-08 14:01:15.553972357 +0200
|
|
@@ -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.11.0.orig/tests/oauth2/test_gdch_credentials.py google-auth-2.11.0/tests/oauth2/test_gdch_credentials.py
|
|
--- google-auth-2.11.0.orig/tests/oauth2/test_gdch_credentials.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/oauth2/test_gdch_credentials.py 2022-09-08 14:01:15.545972277 +0200
|
|
@@ -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.11.0.orig/tests/oauth2/test_id_token.py google-auth-2.11.0/tests/oauth2/test_id_token.py
|
|
--- google-auth-2.11.0.orig/tests/oauth2/test_id_token.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/oauth2/test_id_token.py 2022-09-08 14:01:15.545972277 +0200
|
|
@@ -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.11.0.orig/tests/oauth2/test_reauth.py google-auth-2.11.0/tests/oauth2/test_reauth.py
|
|
--- google-auth-2.11.0.orig/tests/oauth2/test_reauth.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/oauth2/test_reauth.py 2022-09-08 14:01:15.553972357 +0200
|
|
@@ -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.11.0.orig/tests/oauth2/test_service_account.py google-auth-2.11.0/tests/oauth2/test_service_account.py
|
|
--- google-auth-2.11.0.orig/tests/oauth2/test_service_account.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/oauth2/test_service_account.py 2022-09-08 14:01:15.549972317 +0200
|
|
@@ -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.11.0.orig/tests/oauth2/test_sts.py google-auth-2.11.0/tests/oauth2/test_sts.py
|
|
--- google-auth-2.11.0.orig/tests/oauth2/test_sts.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/oauth2/test_sts.py 2022-09-08 14:01:15.561972436 +0200
|
|
@@ -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.11.0.orig/tests/test_app_engine.py google-auth-2.11.0/tests/test_app_engine.py
|
|
--- google-auth-2.11.0.orig/tests/test_app_engine.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/test_app_engine.py 2022-09-08 14:01:15.533972159 +0200
|
|
@@ -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.11.0.orig/tests/test_aws.py google-auth-2.11.0/tests/test_aws.py
|
|
--- google-auth-2.11.0.orig/tests/test_aws.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/test_aws.py 2022-09-08 14:01:15.601972833 +0200
|
|
@@ -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.11.0.orig/tests/test__cloud_sdk.py google-auth-2.11.0/tests/test__cloud_sdk.py
|
|
--- google-auth-2.11.0.orig/tests/test__cloud_sdk.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/test__cloud_sdk.py 2022-09-08 14:01:15.541972237 +0200
|
|
@@ -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.11.0.orig/tests/test__default.py google-auth-2.11.0/tests/test__default.py
|
|
--- google-auth-2.11.0.orig/tests/test__default.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/test__default.py 2022-09-08 14:01:15.565972476 +0200
|
|
@@ -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.11.0.orig/tests/test_downscoped.py google-auth-2.11.0/tests/test_downscoped.py
|
|
--- google-auth-2.11.0.orig/tests/test_downscoped.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/test_downscoped.py 2022-09-08 14:01:15.569972516 +0200
|
|
@@ -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.11.0.orig/tests/test_external_account.py google-auth-2.11.0/tests/test_external_account.py
|
|
--- google-auth-2.11.0.orig/tests/test_external_account.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/test_external_account.py 2022-09-08 14:01:15.509971920 +0200
|
|
@@ -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.11.0.orig/tests/test_iam.py google-auth-2.11.0/tests/test_iam.py
|
|
--- google-auth-2.11.0.orig/tests/test_iam.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/test_iam.py 2022-09-08 14:01:15.577972595 +0200
|
|
@@ -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.11.0.orig/tests/test_identity_pool.py google-auth-2.11.0/tests/test_identity_pool.py
|
|
--- google-auth-2.11.0.orig/tests/test_identity_pool.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/test_identity_pool.py 2022-09-08 14:01:15.577972595 +0200
|
|
@@ -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.11.0.orig/tests/test_impersonated_credentials.py google-auth-2.11.0/tests/test_impersonated_credentials.py
|
|
--- google-auth-2.11.0.orig/tests/test_impersonated_credentials.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/test_impersonated_credentials.py 2022-09-08 14:01:15.593972754 +0200
|
|
@@ -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.11.0.orig/tests/test_jwt.py google-auth-2.11.0/tests/test_jwt.py
|
|
--- google-auth-2.11.0.orig/tests/test_jwt.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/test_jwt.py 2022-09-08 14:01:15.581972634 +0200
|
|
@@ -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.11.0.orig/tests/test__oauth2client.py google-auth-2.11.0/tests/test__oauth2client.py
|
|
--- google-auth-2.11.0.orig/tests/test__oauth2client.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/test__oauth2client.py 2022-09-08 14:01:15.537972198 +0200
|
|
@@ -16,7 +16,7 @@
|
|
import os
|
|
import sys
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
import oauth2client.client # type: ignore
|
|
import oauth2client.contrib.gce # type: ignore
|
|
import oauth2client.service_account # type: ignore
|
|
diff -Nru google-auth-2.11.0.orig/tests/test_pluggable.py google-auth-2.11.0/tests/test_pluggable.py
|
|
--- google-auth-2.11.0.orig/tests/test_pluggable.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/test_pluggable.py 2022-09-08 14:01:15.597972793 +0200
|
|
@@ -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.11.0.orig/tests/transport/test__custom_tls_signer.py google-auth-2.11.0/tests/transport/test__custom_tls_signer.py
|
|
--- google-auth-2.11.0.orig/tests/transport/test__custom_tls_signer.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/transport/test__custom_tls_signer.py 2022-09-08 14:01:15.513971960 +0200
|
|
@@ -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.11.0.orig/tests/transport/test_grpc.py google-auth-2.11.0/tests/transport/test_grpc.py
|
|
--- google-auth-2.11.0.orig/tests/transport/test_grpc.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/transport/test_grpc.py 2022-09-08 14:01:15.517971999 +0200
|
|
@@ -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.11.0.orig/tests/transport/test__mtls_helper.py google-auth-2.11.0/tests/transport/test__mtls_helper.py
|
|
--- google-auth-2.11.0.orig/tests/transport/test__mtls_helper.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/transport/test__mtls_helper.py 2022-09-08 14:01:15.521972039 +0200
|
|
@@ -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.11.0.orig/tests/transport/test_mtls.py google-auth-2.11.0/tests/transport/test_mtls.py
|
|
--- google-auth-2.11.0.orig/tests/transport/test_mtls.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/transport/test_mtls.py 2022-09-08 14:01:15.521972039 +0200
|
|
@@ -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.11.0.orig/tests/transport/test_requests.py google-auth-2.11.0/tests/transport/test_requests.py
|
|
--- google-auth-2.11.0.orig/tests/transport/test_requests.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/transport/test_requests.py 2022-09-08 14:01:15.525972079 +0200
|
|
@@ -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.11.0.orig/tests/transport/test_urllib3.py google-auth-2.11.0/tests/transport/test_urllib3.py
|
|
--- google-auth-2.11.0.orig/tests/transport/test_urllib3.py 2022-08-20 01:27:12.000000000 +0200
|
|
+++ google-auth-2.11.0/tests/transport/test_urllib3.py 2022-09-08 14:01:15.513971960 +0200
|
|
@@ -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
|