Markéta Machová
6d02fe483c
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-google-api-core?expand=0&rev=74
386 lines
11 KiB
Diff
386 lines
11 KiB
Diff
From 5f28e210306de47ff5a9fa3b4bf48ac6ceb13e85 Mon Sep 17 00:00:00 2001
|
|
From: Steve Kowalik <steven@wedontsleep.org>
|
|
Date: Wed, 2 Oct 2024 13:50:33 +1000
|
|
Subject: [PATCH] test: Switch to unittest.mock from mock
|
|
|
|
Now that the minimum supported version of Python is 3.7, we can stop
|
|
using the external mock requirement, and import it from unittest. I have
|
|
also attempted to keep imports ordered.
|
|
|
|
Fixes #377
|
|
---
|
|
noxfile.py | 2 --
|
|
tests/asyncio/future/test_async_future.py | 2 +-
|
|
tests/asyncio/gapic/test_method_async.py | 2 +-
|
|
tests/asyncio/operations_v1/test_operations_async_client.py | 3 ++-
|
|
tests/asyncio/retry/test_retry_streaming_async.py | 4 ++--
|
|
tests/asyncio/retry/test_retry_unary_async.py | 2 +-
|
|
tests/asyncio/test_grpc_helpers_async.py | 3 ++-
|
|
tests/asyncio/test_operation_async.py | 3 ++-
|
|
tests/asyncio/test_page_iterator_async.py | 2 +-
|
|
tests/asyncio/test_rest_streaming_async.py | 6 +++---
|
|
tests/unit/future/test__helpers.py | 2 +-
|
|
tests/unit/future/test_polling.py | 2 +-
|
|
tests/unit/gapic/test_method.py | 2 +-
|
|
tests/unit/operations_v1/test_operations_rest_client.py | 2 +-
|
|
tests/unit/retry/test_retry_base.py | 2 +-
|
|
tests/unit/retry/test_retry_streaming.py | 2 +-
|
|
tests/unit/retry/test_retry_unary.py | 2 +-
|
|
tests/unit/test_bidi.py | 2 +-
|
|
tests/unit/test_exceptions.py | 2 +-
|
|
tests/unit/test_extended_operation.py | 2 +-
|
|
tests/unit/test_grpc_helpers.py | 3 ++-
|
|
tests/unit/test_operation.py | 3 ++-
|
|
tests/unit/test_page_iterator.py | 2 +-
|
|
tests/unit/test_path_template.py | 2 +-
|
|
tests/unit/test_timeout.py | 3 +--
|
|
25 files changed, 32 insertions(+), 30 deletions(-)
|
|
|
|
diff --git a/tests/asyncio/future/test_async_future.py b/tests/asyncio/future/test_async_future.py
|
|
index 0cfe6773..659f41cf 100644
|
|
--- a/tests/asyncio/future/test_async_future.py
|
|
+++ b/tests/asyncio/future/test_async_future.py
|
|
@@ -13,8 +13,8 @@
|
|
# limitations under the License.
|
|
|
|
import asyncio
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
|
|
from google.api_core import exceptions
|
|
diff --git a/tests/asyncio/gapic/test_method_async.py b/tests/asyncio/gapic/test_method_async.py
|
|
index f64157b4..026993e2 100644
|
|
--- a/tests/asyncio/gapic/test_method_async.py
|
|
+++ b/tests/asyncio/gapic/test_method_async.py
|
|
@@ -13,8 +13,8 @@
|
|
# limitations under the License.
|
|
|
|
import datetime
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
|
|
try:
|
|
diff --git a/tests/asyncio/operations_v1/test_operations_async_client.py b/tests/asyncio/operations_v1/test_operations_async_client.py
|
|
index 19ac9b56..e5b20dcd 100644
|
|
--- a/tests/asyncio/operations_v1/test_operations_async_client.py
|
|
+++ b/tests/asyncio/operations_v1/test_operations_async_client.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
|
|
|
|
try:
|
|
diff --git a/tests/asyncio/retry/test_retry_streaming_async.py b/tests/asyncio/retry/test_retry_streaming_async.py
|
|
index 28ae6ff1..a54fc125 100644
|
|
--- a/tests/asyncio/retry/test_retry_streaming_async.py
|
|
+++ b/tests/asyncio/retry/test_retry_streaming_async.py
|
|
@@ -12,11 +12,11 @@
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
+import asyncio
|
|
import datetime
|
|
import re
|
|
-import asyncio
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
|
|
from google.api_core import exceptions
|
|
diff --git a/tests/asyncio/retry/test_retry_unary_async.py b/tests/asyncio/retry/test_retry_unary_async.py
|
|
index fc2f572b..032bab75 100644
|
|
--- a/tests/asyncio/retry/test_retry_unary_async.py
|
|
+++ b/tests/asyncio/retry/test_retry_unary_async.py
|
|
@@ -14,8 +14,8 @@
|
|
|
|
import datetime
|
|
import re
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
|
|
from google.api_core import exceptions
|
|
diff --git a/tests/asyncio/test_grpc_helpers_async.py b/tests/asyncio/test_grpc_helpers_async.py
|
|
index 1a408ccd..a53de083 100644
|
|
--- a/tests/asyncio/test_grpc_helpers_async.py
|
|
+++ b/tests/asyncio/test_grpc_helpers_async.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 # noqa: I202
|
|
|
|
try:
|
|
diff --git a/tests/asyncio/test_operation_async.py b/tests/asyncio/test_operation_async.py
|
|
index 127ba634..f7ebad8a 100644
|
|
--- a/tests/asyncio/test_operation_async.py
|
|
+++ b/tests/asyncio/test_operation_async.py
|
|
@@ -13,7 +13,8 @@
|
|
# limitations under the License.
|
|
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
+
|
|
import pytest
|
|
|
|
try:
|
|
diff --git a/tests/asyncio/test_page_iterator_async.py b/tests/asyncio/test_page_iterator_async.py
|
|
index 75f9e1cf..e661bd26 100644
|
|
--- a/tests/asyncio/test_page_iterator_async.py
|
|
+++ b/tests/asyncio/test_page_iterator_async.py
|
|
@@ -13,8 +13,8 @@
|
|
# limitations under the License.
|
|
|
|
import inspect
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
|
|
from google.api_core import page_iterator_async
|
|
diff --git a/tests/asyncio/test_rest_streaming_async.py b/tests/asyncio/test_rest_streaming_async.py
|
|
index da5b1c8d..f726cbee 100644
|
|
--- a/tests/asyncio/test_rest_streaming_async.py
|
|
+++ b/tests/asyncio/test_rest_streaming_async.py
|
|
@@ -15,14 +15,14 @@
|
|
# TODO: set random.seed explicitly in each test function.
|
|
# See related issue: https://github.com/googleapis/python-api-core/issues/689.
|
|
|
|
-import pytest # noqa: I202
|
|
-import mock
|
|
-
|
|
import datetime
|
|
import logging
|
|
import random
|
|
import time
|
|
from typing import List, AsyncIterator
|
|
+from unittest import mock
|
|
+
|
|
+import pytest # noqa: I202
|
|
|
|
import proto
|
|
|
|
diff --git a/tests/unit/future/test__helpers.py b/tests/unit/future/test__helpers.py
|
|
index 98afc599..a37efdd4 100644
|
|
--- a/tests/unit/future/test__helpers.py
|
|
+++ b/tests/unit/future/test__helpers.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.api_core.future import _helpers
|
|
|
|
diff --git a/tests/unit/future/test_polling.py b/tests/unit/future/test_polling.py
|
|
index f5d9b4f1..2f66f230 100644
|
|
--- a/tests/unit/future/test_polling.py
|
|
+++ b/tests/unit/future/test_polling.py
|
|
@@ -15,8 +15,8 @@
|
|
import concurrent.futures
|
|
import threading
|
|
import time
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
|
|
from google.api_core import exceptions, retry
|
|
diff --git a/tests/unit/gapic/test_method.py b/tests/unit/gapic/test_method.py
|
|
index d966f478..87aa6390 100644
|
|
--- a/tests/unit/gapic/test_method.py
|
|
+++ b/tests/unit/gapic/test_method.py
|
|
@@ -13,8 +13,8 @@
|
|
# limitations under the License.
|
|
|
|
import datetime
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
|
|
try:
|
|
diff --git a/tests/unit/operations_v1/test_operations_rest_client.py b/tests/unit/operations_v1/test_operations_rest_client.py
|
|
index 4ab4f1f7..26f34c40 100644
|
|
--- a/tests/unit/operations_v1/test_operations_rest_client.py
|
|
+++ b/tests/unit/operations_v1/test_operations_rest_client.py
|
|
@@ -14,8 +14,8 @@
|
|
# limitations under the License.
|
|
#
|
|
import os
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
|
|
try:
|
|
diff --git a/tests/unit/retry/test_retry_base.py b/tests/unit/retry/test_retry_base.py
|
|
index a0c6776b..212c4293 100644
|
|
--- a/tests/unit/retry/test_retry_base.py
|
|
+++ b/tests/unit/retry/test_retry_base.py
|
|
@@ -14,8 +14,8 @@
|
|
|
|
import itertools
|
|
import re
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
import requests.exceptions
|
|
|
|
diff --git a/tests/unit/retry/test_retry_streaming.py b/tests/unit/retry/test_retry_streaming.py
|
|
index 01f35327..82b60b05 100644
|
|
--- a/tests/unit/retry/test_retry_streaming.py
|
|
+++ b/tests/unit/retry/test_retry_streaming.py
|
|
@@ -13,8 +13,8 @@
|
|
# limitations under the License.
|
|
|
|
import re
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
|
|
from google.api_core import exceptions
|
|
diff --git a/tests/unit/retry/test_retry_unary.py b/tests/unit/retry/test_retry_unary.py
|
|
index 7dcd8dd6..b018fa96 100644
|
|
--- a/tests/unit/retry/test_retry_unary.py
|
|
+++ b/tests/unit/retry/test_retry_unary.py
|
|
@@ -14,8 +14,8 @@
|
|
|
|
import datetime
|
|
import re
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
|
|
from google.api_core import exceptions
|
|
diff --git a/tests/unit/test_bidi.py b/tests/unit/test_bidi.py
|
|
index 84ac9dc5..08e80afd 100644
|
|
--- a/tests/unit/test_bidi.py
|
|
+++ b/tests/unit/test_bidi.py
|
|
@@ -16,8 +16,8 @@
|
|
import logging
|
|
import queue
|
|
import threading
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
|
|
try:
|
|
diff --git a/tests/unit/test_exceptions.py b/tests/unit/test_exceptions.py
|
|
index 07a36817..e3f8f909 100644
|
|
--- a/tests/unit/test_exceptions.py
|
|
+++ b/tests/unit/test_exceptions.py
|
|
@@ -14,8 +14,8 @@
|
|
|
|
import http.client
|
|
import json
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
import requests
|
|
|
|
diff --git a/tests/unit/test_extended_operation.py b/tests/unit/test_extended_operation.py
|
|
index 53af5204..ab550662 100644
|
|
--- a/tests/unit/test_extended_operation.py
|
|
+++ b/tests/unit/test_extended_operation.py
|
|
@@ -15,8 +15,8 @@
|
|
import dataclasses
|
|
import enum
|
|
import typing
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
|
|
from google.api_core import exceptions
|
|
diff --git a/tests/unit/test_grpc_helpers.py b/tests/unit/test_grpc_helpers.py
|
|
index 59442d43..8de9d8c0 100644
|
|
--- a/tests/unit/test_grpc_helpers.py
|
|
+++ b/tests/unit/test_grpc_helpers.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
|
|
|
|
try:
|
|
diff --git a/tests/unit/test_operation.py b/tests/unit/test_operation.py
|
|
index f029866c..80680720 100644
|
|
--- a/tests/unit/test_operation.py
|
|
+++ b/tests/unit/test_operation.py
|
|
@@ -13,7 +13,8 @@
|
|
# limitations under the License.
|
|
|
|
|
|
-import mock
|
|
+from unittest import mock
|
|
+
|
|
import pytest
|
|
|
|
try:
|
|
diff --git a/tests/unit/test_page_iterator.py b/tests/unit/test_page_iterator.py
|
|
index cf43aedf..560722c5 100644
|
|
--- a/tests/unit/test_page_iterator.py
|
|
+++ b/tests/unit/test_page_iterator.py
|
|
@@ -14,8 +14,8 @@
|
|
|
|
import math
|
|
import types
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
|
|
from google.api_core import page_iterator
|
|
diff --git a/tests/unit/test_path_template.py b/tests/unit/test_path_template.py
|
|
index 808b36f3..c34dd0f3 100644
|
|
--- a/tests/unit/test_path_template.py
|
|
+++ b/tests/unit/test_path_template.py
|
|
@@ -13,8 +13,8 @@
|
|
# limitations under the License.
|
|
|
|
from __future__ import unicode_literals
|
|
+from unittest import mock
|
|
|
|
-import mock
|
|
import pytest
|
|
|
|
from google.api import auth_pb2
|
|
diff --git a/tests/unit/test_timeout.py b/tests/unit/test_timeout.py
|
|
index 0bcf07f0..60a2e65d 100644
|
|
--- a/tests/unit/test_timeout.py
|
|
+++ b/tests/unit/test_timeout.py
|
|
@@ -14,8 +14,7 @@
|
|
|
|
import datetime
|
|
import itertools
|
|
-
|
|
-import mock
|
|
+from unittest import mock
|
|
|
|
from google.api_core import timeout as timeouts
|
|
|