1
0
python-google-auth/python-google-auth-no-mock.patch

337 lines
13 KiB
Diff
Raw Normal View History

diff -upr google-auth-2.7.0.orig/tests/compute_engine/test_credentials.py google-auth-2.7.0/tests/compute_engine/test_credentials.py
--- google-auth-2.7.0.orig/tests/compute_engine/test_credentials.py 2022-06-08 10:35:11.954473507 +0200
+++ google-auth-2.7.0/tests/compute_engine/test_credentials.py 2022-06-08 10:35:11.970473600 +0200
@@ -14,7 +14,7 @@
import base64
import datetime
-import mock
+from unittest import mock
import pytest # type: ignore
import responses # type: ignore
diff -upr google-auth-2.7.0.orig/tests/compute_engine/test__metadata.py google-auth-2.7.0/tests/compute_engine/test__metadata.py
--- google-auth-2.7.0.orig/tests/compute_engine/test__metadata.py 2022-06-08 10:35:11.954473507 +0200
+++ google-auth-2.7.0/tests/compute_engine/test__metadata.py 2022-06-08 10:35:11.970473600 +0200
@@ -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
diff -upr google-auth-2.7.0.orig/tests/conftest.py google-auth-2.7.0/tests/conftest.py
--- google-auth-2.7.0.orig/tests/conftest.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/conftest.py 2022-06-08 10:35:11.970473600 +0200
@@ -15,7 +15,7 @@
import os
import sys
-import mock
+from unittest import mock
import pytest # type: ignore
diff -upr google-auth-2.7.0.orig/tests/crypt/test__python_rsa.py google-auth-2.7.0/tests/crypt/test__python_rsa.py
--- google-auth-2.7.0.orig/tests/crypt/test__python_rsa.py 2022-06-08 10:35:11.954473507 +0200
+++ google-auth-2.7.0/tests/crypt/test__python_rsa.py 2022-06-08 10:35:11.970473600 +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 -upr google-auth-2.7.0.orig/tests/oauth2/test_challenges.py google-auth-2.7.0/tests/oauth2/test_challenges.py
--- google-auth-2.7.0.orig/tests/oauth2/test_challenges.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/oauth2/test_challenges.py 2022-06-08 10:35:11.970473600 +0200
@@ -17,7 +17,7 @@
import base64
import sys
-import mock
+from unittest import mock
import pytest # type: ignore
import pyu2f # type: ignore
diff -upr google-auth-2.7.0.orig/tests/oauth2/test__client.py google-auth-2.7.0/tests/oauth2/test__client.py
--- google-auth-2.7.0.orig/tests/oauth2/test__client.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/oauth2/test__client.py 2022-06-08 10:35:11.970473600 +0200
@@ -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
diff -upr google-auth-2.7.0.orig/tests/oauth2/test_credentials.py google-auth-2.7.0/tests/oauth2/test_credentials.py
--- google-auth-2.7.0.orig/tests/oauth2/test_credentials.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/oauth2/test_credentials.py 2022-06-08 10:35:11.970473600 +0200
@@ -18,7 +18,7 @@ import os
import pickle
import sys
-import mock
+from unittest import mock
import pytest # type: ignore
from google.auth import _helpers
diff -upr google-auth-2.7.0.orig/tests/oauth2/test_id_token.py google-auth-2.7.0/tests/oauth2/test_id_token.py
--- google-auth-2.7.0.orig/tests/oauth2/test_id_token.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/oauth2/test_id_token.py 2022-06-08 10:35:11.970473600 +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 -upr google-auth-2.7.0.orig/tests/oauth2/test_reauth.py google-auth-2.7.0/tests/oauth2/test_reauth.py
--- google-auth-2.7.0.orig/tests/oauth2/test_reauth.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/oauth2/test_reauth.py 2022-06-08 10:35:11.970473600 +0200
@@ -14,7 +14,7 @@
import copy
-import mock
+from unittest import mock
import pytest # type: ignore
from google.auth import exceptions
diff -upr google-auth-2.7.0.orig/tests/oauth2/test_service_account.py google-auth-2.7.0/tests/oauth2/test_service_account.py
--- google-auth-2.7.0.orig/tests/oauth2/test_service_account.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/oauth2/test_service_account.py 2022-06-08 10:35:11.970473600 +0200
@@ -16,7 +16,7 @@ import datetime
import json
import os
-import mock
+from unittest import mock
from google.auth import _helpers
from google.auth import crypt
diff -upr google-auth-2.7.0.orig/tests/oauth2/test_sts.py google-auth-2.7.0/tests/oauth2/test_sts.py
--- google-auth-2.7.0.orig/tests/oauth2/test_sts.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/oauth2/test_sts.py 2022-06-08 10:35:11.974473623 +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 -upr google-auth-2.7.0.orig/tests/test_app_engine.py google-auth-2.7.0/tests/test_app_engine.py
--- google-auth-2.7.0.orig/tests/test_app_engine.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/test_app_engine.py 2022-06-08 10:35:11.974473623 +0200
@@ -14,7 +14,7 @@
import datetime
-import mock
+from unittest import mock
import pytest # type: ignore
from google.auth import app_engine
diff -upr google-auth-2.7.0.orig/tests/test_aws.py google-auth-2.7.0/tests/test_aws.py
--- google-auth-2.7.0.orig/tests/test_aws.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/test_aws.py 2022-06-08 10:35:11.974473623 +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 -upr google-auth-2.7.0.orig/tests/test__cloud_sdk.py google-auth-2.7.0/tests/test__cloud_sdk.py
--- google-auth-2.7.0.orig/tests/test__cloud_sdk.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/test__cloud_sdk.py 2022-06-08 10:35:11.978473646 +0200
@@ -17,7 +17,7 @@ import json
import os
import subprocess
-import mock
+from unittest import mock
import pytest # type: ignore
from google.auth import _cloud_sdk
diff -upr google-auth-2.7.0.orig/tests/test__default.py google-auth-2.7.0/tests/test__default.py
--- google-auth-2.7.0.orig/tests/test__default.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/test__default.py 2022-06-08 10:35:11.974473623 +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 -upr google-auth-2.7.0.orig/tests/test_downscoped.py google-auth-2.7.0/tests/test_downscoped.py
--- google-auth-2.7.0.orig/tests/test_downscoped.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/test_downscoped.py 2022-06-08 10:35:11.974473623 +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 -upr google-auth-2.7.0.orig/tests/test_external_account.py google-auth-2.7.0/tests/test_external_account.py
--- google-auth-2.7.0.orig/tests/test_external_account.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/test_external_account.py 2022-06-08 10:35:11.974473623 +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 -upr google-auth-2.7.0.orig/tests/test_iam.py google-auth-2.7.0/tests/test_iam.py
--- google-auth-2.7.0.orig/tests/test_iam.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/test_iam.py 2022-06-08 10:35:11.974473623 +0200
@@ -16,7 +16,7 @@ import base64
import datetime
import json
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
diff -upr google-auth-2.7.0.orig/tests/test_identity_pool.py google-auth-2.7.0/tests/test_identity_pool.py
--- google-auth-2.7.0.orig/tests/test_identity_pool.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/test_identity_pool.py 2022-06-08 10:35:11.974473623 +0200
@@ -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 urllib
diff -upr google-auth-2.7.0.orig/tests/test_impersonated_credentials.py google-auth-2.7.0/tests/test_impersonated_credentials.py
--- google-auth-2.7.0.orig/tests/test_impersonated_credentials.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/test_impersonated_credentials.py 2022-06-08 10:35:11.974473623 +0200
@@ -19,7 +19,7 @@ import os
# 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 -upr google-auth-2.7.0.orig/tests/test_jwt.py google-auth-2.7.0/tests/test_jwt.py
--- google-auth-2.7.0.orig/tests/test_jwt.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/test_jwt.py 2022-06-08 10:35:11.974473623 +0200
@@ -17,7 +17,7 @@ import datetime
import json
import os
-import mock
+from unittest import mock
import pytest # type: ignore
from google.auth import _helpers
diff -upr google-auth-2.7.0.orig/tests/test__oauth2client.py google-auth-2.7.0/tests/test__oauth2client.py
--- google-auth-2.7.0.orig/tests/test__oauth2client.py 2022-06-08 10:35:11.958473530 +0200
+++ google-auth-2.7.0/tests/test__oauth2client.py 2022-06-08 10:35:11.974473623 +0200
@@ -16,7 +16,7 @@ import datetime
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 -upr google-auth-2.7.0.orig/tests/transport/test__custom_tls_signer.py google-auth-2.7.0/tests/transport/test__custom_tls_signer.py
--- google-auth-2.7.0.orig/tests/transport/test__custom_tls_signer.py 2022-06-08 10:35:11.954473507 +0200
+++ google-auth-2.7.0/tests/transport/test__custom_tls_signer.py 2022-06-08 10:35:11.978473646 +0200
@@ -16,7 +16,7 @@ import base64
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 -upr google-auth-2.7.0.orig/tests/transport/test_grpc.py google-auth-2.7.0/tests/transport/test_grpc.py
--- google-auth-2.7.0.orig/tests/transport/test_grpc.py 2022-06-08 10:35:11.954473507 +0200
+++ google-auth-2.7.0/tests/transport/test_grpc.py 2022-06-08 10:35:11.978473646 +0200
@@ -16,7 +16,7 @@ import datetime
import os
import time
-import mock
+from unittest import mock
import pytest # type: ignore
from google.auth import _helpers
diff -upr google-auth-2.7.0.orig/tests/transport/test__mtls_helper.py google-auth-2.7.0/tests/transport/test__mtls_helper.py
--- google-auth-2.7.0.orig/tests/transport/test__mtls_helper.py 2022-06-08 10:35:11.954473507 +0200
+++ google-auth-2.7.0/tests/transport/test__mtls_helper.py 2022-06-08 10:35:11.978473646 +0200
@@ -15,7 +15,7 @@
import os
import re
-import mock
+from unittest import mock
from OpenSSL import crypto
import pytest # type: ignore
diff -upr google-auth-2.7.0.orig/tests/transport/test_mtls.py google-auth-2.7.0/tests/transport/test_mtls.py
--- google-auth-2.7.0.orig/tests/transport/test_mtls.py 2022-06-08 10:35:11.954473507 +0200
+++ google-auth-2.7.0/tests/transport/test_mtls.py 2022-06-08 10:35:11.978473646 +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 -upr google-auth-2.7.0.orig/tests/transport/test_requests.py google-auth-2.7.0/tests/transport/test_requests.py
--- google-auth-2.7.0.orig/tests/transport/test_requests.py 2022-06-08 10:35:11.954473507 +0200
+++ google-auth-2.7.0/tests/transport/test_requests.py 2022-06-08 10:35:11.978473646 +0200
@@ -18,7 +18,7 @@ import os
import sys
import freezegun
-import mock
+from unittest import mock
import OpenSSL
import pytest # type: ignore
import requests
diff -upr google-auth-2.7.0.orig/tests/transport/test_urllib3.py google-auth-2.7.0/tests/transport/test_urllib3.py
--- google-auth-2.7.0.orig/tests/transport/test_urllib3.py 2022-06-08 10:35:11.954473507 +0200
+++ google-auth-2.7.0/tests/transport/test_urllib3.py 2022-06-08 10:35:11.978473646 +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