NotificationsYou must be signed in to change notification settings
Fork90
Star131

Commit4db4bbf

committed

Switch to unittest.mock from mock

Now that the minimum supported version of Python is 3.7, we can stopusing the external mock requirement, and import it from unittest. I havealso attempted to keep imports ordered.Fixes#377

1 parent84bf637 commit4db4bbfCopy full SHA for 4db4bbf

File tree

25 files changed

+32

-30

lines changed

noxfile.py
tests
- asyncio
  - future
    - test_async_future.py
  - gapic
    - test_method_async.py
  - operations_v1
    - test_operations_async_client.py
  - retry
    - test_retry_streaming_async.py
    - test_retry_unary_async.py
  - test_grpc_helpers_async.py
  - test_operation_async.py
  - test_page_iterator_async.py
  - test_rest_streaming_async.py
- unit

25 files changed

+32

-30

lines changed

`‎noxfile.py`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,6 @@ def default(session, install_grpc=True, prerelease=False, install_async_rest=Fal`
`124`	`124`
`125`	`125`	`session.install(`
`126`	`126`	`"dataclasses",`
`127`		`-"mock",`
`128`	`127`	`"pytest",`
`129`	`128`	`"pytest-cov",`
`130`	`129`	`"pytest-xdist",`
`@@ -280,7 +279,6 @@ def mypy(session):`
`280`	`279`	`"types-setuptools",`
`281`	`280`	`"types-requests",`
`282`	`281`	`"types-protobuf",`
`283`		`-"types-mock",`
`284`	`282`	`"types-dataclasses",`
`285`	`283`	`)`
`286`	`284`	`session.run("mypy","google","tests")`

`‎tests/asyncio/future/test_async_future.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`	`importasyncio`
	`16`	`+fromunittestimportmock`
`16`	`17`
`17`		`-importmock`
`18`	`18`	`importpytest`
`19`	`19`
`20`	`20`	`fromgoogle.api_coreimportexceptions`

`‎tests/asyncio/gapic/test_method_async.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`	`importdatetime`
	`16`	`+fromunittestimportmock`
`16`	`17`
`17`		`-importmock`
`18`	`18`	`importpytest`
`19`	`19`
`20`	`20`	`try:`

`‎tests/asyncio/operations_v1/test_operations_async_client.py`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@`
`12`	`12`	`# See the License for the specific language governing permissions and`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`		`-importmock`
	`15`	`+fromunittestimportmock`
	`16`	`+`
`16`	`17`	`importpytest`
`17`	`18`
`18`	`19`	`try:`

`‎tests/asyncio/retry/test_retry_streaming_async.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@`
`12`	`12`	`# See the License for the specific language governing permissions and`
`13`	`13`	`# limitations under the License.`
`14`	`14`
	`15`	`+importasyncio`
`15`	`16`	`importdatetime`
`16`	`17`	`importre`
`17`		`-importasyncio`
	`18`	`+fromunittestimportmock`
`18`	`19`
`19`		`-importmock`
`20`	`20`	`importpytest`
`21`	`21`
`22`	`22`	`fromgoogle.api_coreimportexceptions`

`‎tests/asyncio/retry/test_retry_unary_async.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`
`15`	`15`	`importdatetime`
`16`	`16`	`importre`
	`17`	`+fromunittestimportmock`
`17`	`18`
`18`		`-importmock`
`19`	`19`	`importpytest`
`20`	`20`
`21`	`21`	`fromgoogle.api_coreimportexceptions`

`‎tests/asyncio/test_grpc_helpers_async.py`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@`
`12`	`12`	`# See the License for the specific language governing permissions and`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`		`-importmock`
	`15`	`+fromunittestimportmock`
	`16`	`+`
`16`	`17`	`importpytest# noqa: I202`
`17`	`18`
`18`	`19`	`try:`

`‎tests/asyncio/test_operation_async.py`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`
`16`		`-importmock`
	`16`	`+fromunittestimportmock`
	`17`	`+`
`17`	`18`	`importpytest`
`18`	`19`
`19`	`20`	`try:`

`‎tests/asyncio/test_page_iterator_async.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`	`importinspect`
	`16`	`+fromunittestimportmock`
`16`	`17`
`17`		`-importmock`
`18`	`18`	`importpytest`
`19`	`19`
`20`	`20`	`fromgoogle.api_coreimportpage_iterator_async`

`‎tests/asyncio/test_rest_streaming_async.py`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,14 @@`
`15`	`15`	`# TODO: set random.seed explicitly in each test function.`
`16`	`16`	`# See related issue: https://github.com/googleapis/python-api-core/issues/689.`
`17`	`17`
`18`		`-importpytest# noqa: I202`
`19`		`-importmock`
`20`		`-`
`21`	`18`	`importdatetime`
`22`	`19`	`importlogging`
`23`	`20`	`importrandom`
`24`	`21`	`importtime`
`25`	`22`	`fromtypingimportList,AsyncIterator`
	`23`	`+fromunittestimportmock`
	`24`	`+`
	`25`	`+importpytest# noqa: I202`
`26`	`26`
`27`	`27`	`importproto`
`28`	`28`

`‎tests/unit/future/test__helpers.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`# See the License for the specific language governing permissions and`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`		`-importmock`
	`15`	`+fromunittestimportmock`
`16`	`16`
`17`	`17`	`fromgoogle.api_core.futureimport_helpers`
`18`	`18`

`‎tests/unit/future/test_polling.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`importconcurrent.futures`
`16`	`16`	`importthreading`
`17`	`17`	`importtime`
	`18`	`+fromunittestimportmock`
`18`	`19`
`19`		`-importmock`
`20`	`20`	`importpytest`
`21`	`21`
`22`	`22`	`fromgoogle.api_coreimportexceptions,retry`

`‎tests/unit/gapic/test_method.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`	`importdatetime`
	`16`	`+fromunittestimportmock`
`16`	`17`
`17`		`-importmock`
`18`	`18`	`importpytest`
`19`	`19`
`20`	`20`	`try:`

`‎tests/unit/operations_v1/test_operations_rest_client.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`	`# limitations under the License.`
`15`	`15`	`#`
`16`	`16`	`importos`
	`17`	`+fromunittestimportmock`
`17`	`18`
`18`		`-importmock`
`19`	`19`	`importpytest`
`20`	`20`
`21`	`21`	`try:`

`‎tests/unit/retry/test_retry_base.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`
`15`	`15`	`importitertools`
`16`	`16`	`importre`
	`17`	`+fromunittestimportmock`
`17`	`18`
`18`		`-importmock`
`19`	`19`	`importpytest`
`20`	`20`	`importrequests.exceptions`
`21`	`21`

`‎tests/unit/retry/test_retry_streaming.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`	`importre`
	`16`	`+fromunittestimportmock`
`16`	`17`
`17`		`-importmock`
`18`	`18`	`importpytest`
`19`	`19`
`20`	`20`	`fromgoogle.api_coreimportexceptions`

`‎tests/unit/retry/test_retry_unary.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`
`15`	`15`	`importdatetime`
`16`	`16`	`importre`
	`17`	`+fromunittestimportmock`
`17`	`18`
`18`		`-importmock`
`19`	`19`	`importpytest`
`20`	`20`
`21`	`21`	`fromgoogle.api_coreimportexceptions`

`‎tests/unit/test_bidi.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@`
`16`	`16`	`importlogging`
`17`	`17`	`importqueue`
`18`	`18`	`importthreading`
	`19`	`+fromunittestimportmock`
`19`	`20`
`20`		`-importmock`
`21`	`21`	`importpytest`
`22`	`22`
`23`	`23`	`try:`

`‎tests/unit/test_exceptions.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`
`15`	`15`	`importhttp.client`
`16`	`16`	`importjson`
	`17`	`+fromunittestimportmock`
`17`	`18`
`18`		`-importmock`
`19`	`19`	`importpytest`
`20`	`20`	`importrequests`
`21`	`21`

`‎tests/unit/test_extended_operation.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`importdataclasses`
`16`	`16`	`importenum`
`17`	`17`	`importtyping`
	`18`	`+fromunittestimportmock`
`18`	`19`
`19`		`-importmock`
`20`	`20`	`importpytest`
`21`	`21`
`22`	`22`	`fromgoogle.api_coreimportexceptions`

`‎tests/unit/test_grpc_helpers.py`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@`
`12`	`12`	`# See the License for the specific language governing permissions and`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`		`-importmock`
	`15`	`+fromunittestimportmock`
	`16`	`+`
`16`	`17`	`importpytest`
`17`	`18`
`18`	`19`	`try:`

`‎tests/unit/test_operation.py`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`
`16`		`-importmock`
	`16`	`+fromunittestimportmock`
	`17`	`+`
`17`	`18`	`importpytest`
`18`	`19`
`19`	`20`	`try:`

`‎tests/unit/test_page_iterator.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`
`15`	`15`	`importmath`
`16`	`16`	`importtypes`
	`17`	`+fromunittestimportmock`
`17`	`18`
`18`		`-importmock`
`19`	`19`	`importpytest`
`20`	`20`
`21`	`21`	`fromgoogle.api_coreimportpage_iterator`

`‎tests/unit/test_path_template.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`	`from __future__importunicode_literals`
	`16`	`+fromunittestimportmock`
`16`	`17`
`17`		`-importmock`
`18`	`18`	`importpytest`
`19`	`19`
`20`	`20`	`fromgoogle.apiimportauth_pb2`

`‎tests/unit/test_timeout.py`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,7 @@`
`14`	`14`
`15`	`15`	`importdatetime`
`16`	`16`	`importitertools`
`17`		`-`
`18`		`-importmock`
	`17`	`+fromunittestimportmock`
`19`	`18`
`20`	`19`	`fromgoogle.api_coreimporttimeoutastimeouts`
`21`	`20`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4db4bbf

File tree

25 files changed

25 files changed

`‎noxfile.py`

`‎tests/asyncio/future/test_async_future.py`

`‎tests/asyncio/gapic/test_method_async.py`

`‎tests/asyncio/operations_v1/test_operations_async_client.py`

`‎tests/asyncio/retry/test_retry_streaming_async.py`

`‎tests/asyncio/retry/test_retry_unary_async.py`

`‎tests/asyncio/test_grpc_helpers_async.py`

`‎tests/asyncio/test_operation_async.py`

`‎tests/asyncio/test_page_iterator_async.py`

`‎tests/asyncio/test_rest_streaming_async.py`

`‎tests/unit/future/test__helpers.py`

`‎tests/unit/future/test_polling.py`

`‎tests/unit/gapic/test_method.py`

`‎tests/unit/operations_v1/test_operations_rest_client.py`

`‎tests/unit/retry/test_retry_base.py`

`‎tests/unit/retry/test_retry_streaming.py`

`‎tests/unit/retry/test_retry_unary.py`

`‎tests/unit/test_bidi.py`

`‎tests/unit/test_exceptions.py`

`‎tests/unit/test_extended_operation.py`

`‎tests/unit/test_grpc_helpers.py`

`‎tests/unit/test_operation.py`

`‎tests/unit/test_page_iterator.py`

`‎tests/unit/test_path_template.py`

`‎tests/unit/test_timeout.py`

0 commit comments