From 1603829470c95f11521f576b58c97aa5bb2e8e2a Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 28 Mar 2022 23:37:11 +0000 Subject: [PATCH] chore(python): use black==22.3.0 Source-Link: https://github.com/googleapis/synthtool/commit/6fab84af09f2cf89a031fd8671d1def6b2931b11 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:7cffbc10910c3ab1b852c05114a08d374c195a81cdec1d4a67a1d129331d0bfe --- .github/.OwlBot.lock.yaml | 2 +- docs/conf.py | 5 +- .../services/database_admin/async_client.py | 153 +- .../services/database_admin/client.py | 216 ++- .../database_admin/transports/base.py | 26 +- .../database_admin/transports/grpc.py | 3 +- .../spanner_admin_database_v1/types/backup.py | 274 +++- .../spanner_admin_database_v1/types/common.py | 39 +- .../types/spanner_database_admin.py | 280 +++- .../services/instance_admin/async_client.py | 89 +- .../services/instance_admin/client.py | 135 +- .../instance_admin/transports/base.py | 18 +- .../instance_admin/transports/grpc.py | 3 +- .../types/spanner_instance_admin.py | 231 ++- google/cloud/spanner_dbapi/connection.py | 7 +- google/cloud/spanner_dbapi/cursor.py | 7 +- google/cloud/spanner_v1/backup.py | 15 +- google/cloud/spanner_v1/batch.py | 5 +- google/cloud/spanner_v1/database.py | 24 +- google/cloud/spanner_v1/instance.py | 18 +- .../services/spanner/async_client.py | 110 +- .../spanner_v1/services/spanner/client.py | 173 ++- .../services/spanner/transports/base.py | 14 +- .../services/spanner/transports/grpc.py | 3 +- google/cloud/spanner_v1/session.py | 7 +- google/cloud/spanner_v1/snapshot.py | 10 +- google/cloud/spanner_v1/streamed.py | 6 +- google/cloud/spanner_v1/transaction.py | 5 +- .../cloud/spanner_v1/types/commit_response.py | 22 +- google/cloud/spanner_v1/types/keys.py | 43 +- google/cloud/spanner_v1/types/mutation.py | 65 +- google/cloud/spanner_v1/types/query_plan.py | 78 +- google/cloud/spanner_v1/types/result_set.py | 87 +- google/cloud/spanner_v1/types/spanner.py | 423 ++++-- google/cloud/spanner_v1/types/transaction.py | 64 +- google/cloud/spanner_v1/types/type.py | 50 +- noxfile.py | 9 +- samples/samples/noxfile.py | 10 +- tests/system/_sample_data.py | 6 +- tests/system/conftest.py | 3 +- tests/system/test_backup_api.py | 40 +- tests/system/test_database_api.py | 12 +- tests/system/test_dbapi.py | 7 +- tests/system/test_instance_api.py | 5 +- tests/system/test_session_api.py | 67 +- tests/system/utils/streaming_utils.py | 2 +- .../test_database_admin.py | 1297 +++++++++++++---- .../test_instance_admin.py | 701 ++++++--- tests/unit/gapic/spanner_v1/test_spanner.py | 943 +++++++++--- tests/unit/spanner_dbapi/test_connect.py | 11 +- tests/unit/spanner_dbapi/test_connection.py | 16 +- tests/unit/spanner_dbapi/test_cursor.py | 4 +- tests/unit/spanner_dbapi/test_parse_utils.py | 3 +- tests/unit/spanner_dbapi/test_parser.py | 4 +- tests/unit/test__helpers.py | 26 +- tests/unit/test_backup.py | 54 +- tests/unit/test_batch.py | 19 +- tests/unit/test_database.py | 27 +- tests/unit/test_keyset.py | 113 +- tests/unit/test_session.py | 55 +- tests/unit/test_snapshot.py | 26 +- tests/unit/test_streamed.py | 144 +- tests/unit/test_transaction.py | 37 +- 63 files changed, 4861 insertions(+), 1490 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 7e08e05a38..87dd006115 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:5d8da01438ece4021d135433f2cf3227aa39ef0eaccc941d62aa35e6902832ae + digest: sha256:7cffbc10910c3ab1b852c05114a08d374c195a81cdec1d4a67a1d129331d0bfe diff --git a/docs/conf.py b/docs/conf.py index 6410a1a2ad..96337defe2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -361,7 +361,10 @@ intersphinx_mapping = { "python": ("https://python.readthedocs.org/en/latest/", None), "google-auth": ("https://googleapis.dev/python/google-auth/latest/", None), - "google.api_core": ("https://googleapis.dev/python/google-api-core/latest/", None,), + "google.api_core": ( + "https://googleapis.dev/python/google-api-core/latest/", + None, + ), "grpc": ("https://grpc.github.io/grpc/python/", None), "proto-plus": ("https://proto-plus-python.readthedocs.io/en/latest/", None), "protobuf": ("https://googleapis.dev/python/protobuf/latest/", None), diff --git a/google/cloud/spanner_admin_database_v1/services/database_admin/async_client.py b/google/cloud/spanner_admin_database_v1/services/database_admin/async_client.py index e4793ae26b..750c3dd5f5 100644 --- a/google/cloud/spanner_admin_database_v1/services/database_admin/async_client.py +++ b/google/cloud/spanner_admin_database_v1/services/database_admin/async_client.py @@ -331,12 +331,20 @@ def sample_list_databases(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # This method is paged; wrap the response in a pager, which provides # an `__aiter__` convenience method. response = pagers.ListDatabasesAsyncPager( - method=rpc, request=request, response=response, metadata=metadata, + method=rpc, + request=request, + response=response, + metadata=metadata, ) # Done; return the response. @@ -461,7 +469,12 @@ def sample_create_database(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Wrap the response in an operation future. response = operation_async.from_gapic( @@ -568,7 +581,12 @@ def sample_get_database(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -720,7 +738,12 @@ def sample_update_database_ddl(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Wrap the response in an operation future. response = operation_async.from_gapic( @@ -822,7 +845,10 @@ def sample_drop_database(): # Send the request. await rpc( - request, retry=retry, timeout=timeout, metadata=metadata, + request, + retry=retry, + timeout=timeout, + metadata=metadata, ) async def get_database_ddl( @@ -925,7 +951,12 @@ def sample_get_database_ddl(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1062,7 +1093,9 @@ def sample_set_iam_policy(): if isinstance(request, dict): request = iam_policy_pb2.SetIamPolicyRequest(**request) elif not request: - request = iam_policy_pb2.SetIamPolicyRequest(resource=resource,) + request = iam_policy_pb2.SetIamPolicyRequest( + resource=resource, + ) # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1079,7 +1112,12 @@ def sample_set_iam_policy(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1217,7 +1255,9 @@ def sample_get_iam_policy(): if isinstance(request, dict): request = iam_policy_pb2.GetIamPolicyRequest(**request) elif not request: - request = iam_policy_pb2.GetIamPolicyRequest(resource=resource,) + request = iam_policy_pb2.GetIamPolicyRequest( + resource=resource, + ) # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1244,7 +1284,12 @@ def sample_get_iam_policy(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1339,7 +1384,8 @@ def sample_test_iam_permissions(): request = iam_policy_pb2.TestIamPermissionsRequest(**request) elif not request: request = iam_policy_pb2.TestIamPermissionsRequest( - resource=resource, permissions=permissions, + resource=resource, + permissions=permissions, ) # Wrap the RPC method; this adds retry and timeout information, @@ -1357,7 +1403,12 @@ def sample_test_iam_permissions(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1493,7 +1544,12 @@ def sample_create_backup(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Wrap the response in an operation future. response = operation_async.from_gapic( @@ -1655,7 +1711,12 @@ def sample_copy_backup(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Wrap the response in an operation future. response = operation_async.from_gapic( @@ -1763,7 +1824,12 @@ def sample_get_backup(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1883,7 +1949,12 @@ def sample_update_backup(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1978,7 +2049,10 @@ def sample_delete_backup(): # Send the request. await rpc( - request, retry=retry, timeout=timeout, metadata=metadata, + request, + retry=retry, + timeout=timeout, + metadata=metadata, ) async def list_backups( @@ -2083,12 +2157,20 @@ def sample_list_backups(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # This method is paged; wrap the response in a pager, which provides # an `__aiter__` convenience method. response = pagers.ListBackupsAsyncPager( - method=rpc, request=request, response=response, metadata=metadata, + method=rpc, + request=request, + response=response, + metadata=metadata, ) # Done; return the response. @@ -2234,7 +2316,12 @@ def sample_restore_database(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Wrap the response in an operation future. response = operation_async.from_gapic( @@ -2359,12 +2446,20 @@ def sample_list_database_operations(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # This method is paged; wrap the response in a pager, which provides # an `__aiter__` convenience method. response = pagers.ListDatabaseOperationsAsyncPager( - method=rpc, request=request, response=response, metadata=metadata, + method=rpc, + request=request, + response=response, + metadata=metadata, ) # Done; return the response. @@ -2482,12 +2577,20 @@ def sample_list_backup_operations(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # This method is paged; wrap the response in a pager, which provides # an `__aiter__` convenience method. response = pagers.ListBackupOperationsAsyncPager( - method=rpc, request=request, response=response, metadata=metadata, + method=rpc, + request=request, + response=response, + metadata=metadata, ) # Done; return the response. diff --git a/google/cloud/spanner_admin_database_v1/services/database_admin/client.py b/google/cloud/spanner_admin_database_v1/services/database_admin/client.py index a7106d7aa7..3e300807c9 100644 --- a/google/cloud/spanner_admin_database_v1/services/database_admin/client.py +++ b/google/cloud/spanner_admin_database_v1/services/database_admin/client.py @@ -64,7 +64,10 @@ class DatabaseAdminClientMeta(type): _transport_registry["grpc"] = DatabaseAdminGrpcTransport _transport_registry["grpc_asyncio"] = DatabaseAdminGrpcAsyncIOTransport - def get_transport_class(cls, label: str = None,) -> Type[DatabaseAdminTransport]: + def get_transport_class( + cls, + label: str = None, + ) -> Type[DatabaseAdminTransport]: """Returns an appropriate transport class. Args: @@ -177,10 +180,16 @@ def transport(self) -> DatabaseAdminTransport: return self._transport @staticmethod - def backup_path(project: str, instance: str, backup: str,) -> str: + def backup_path( + project: str, + instance: str, + backup: str, + ) -> str: """Returns a fully-qualified backup string.""" return "projects/{project}/instances/{instance}/backups/{backup}".format( - project=project, instance=instance, backup=backup, + project=project, + instance=instance, + backup=backup, ) @staticmethod @@ -194,7 +203,10 @@ def parse_backup_path(path: str) -> Dict[str, str]: @staticmethod def crypto_key_path( - project: str, location: str, key_ring: str, crypto_key: str, + project: str, + location: str, + key_ring: str, + crypto_key: str, ) -> str: """Returns a fully-qualified crypto_key string.""" return "projects/{project}/locations/{location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}".format( @@ -240,10 +252,16 @@ def parse_crypto_key_version_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def database_path(project: str, instance: str, database: str,) -> str: + def database_path( + project: str, + instance: str, + database: str, + ) -> str: """Returns a fully-qualified database string.""" return "projects/{project}/instances/{instance}/databases/{database}".format( - project=project, instance=instance, database=database, + project=project, + instance=instance, + database=database, ) @staticmethod @@ -256,10 +274,14 @@ def parse_database_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def instance_path(project: str, instance: str,) -> str: + def instance_path( + project: str, + instance: str, + ) -> str: """Returns a fully-qualified instance string.""" return "projects/{project}/instances/{instance}".format( - project=project, instance=instance, + project=project, + instance=instance, ) @staticmethod @@ -269,7 +291,9 @@ def parse_instance_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_billing_account_path(billing_account: str,) -> str: + def common_billing_account_path( + billing_account: str, + ) -> str: """Returns a fully-qualified billing_account string.""" return "billingAccounts/{billing_account}".format( billing_account=billing_account, @@ -282,9 +306,13 @@ def parse_common_billing_account_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_folder_path(folder: str,) -> str: + def common_folder_path( + folder: str, + ) -> str: """Returns a fully-qualified folder string.""" - return "folders/{folder}".format(folder=folder,) + return "folders/{folder}".format( + folder=folder, + ) @staticmethod def parse_common_folder_path(path: str) -> Dict[str, str]: @@ -293,9 +321,13 @@ def parse_common_folder_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_organization_path(organization: str,) -> str: + def common_organization_path( + organization: str, + ) -> str: """Returns a fully-qualified organization string.""" - return "organizations/{organization}".format(organization=organization,) + return "organizations/{organization}".format( + organization=organization, + ) @staticmethod def parse_common_organization_path(path: str) -> Dict[str, str]: @@ -304,9 +336,13 @@ def parse_common_organization_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_project_path(project: str,) -> str: + def common_project_path( + project: str, + ) -> str: """Returns a fully-qualified project string.""" - return "projects/{project}".format(project=project,) + return "projects/{project}".format( + project=project, + ) @staticmethod def parse_common_project_path(path: str) -> Dict[str, str]: @@ -315,10 +351,14 @@ def parse_common_project_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_location_path(project: str, location: str,) -> str: + def common_location_path( + project: str, + location: str, + ) -> str: """Returns a fully-qualified location string.""" return "projects/{project}/locations/{location}".format( - project=project, location=location, + project=project, + location=location, ) @staticmethod @@ -582,12 +622,20 @@ def sample_list_databases(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # This method is paged; wrap the response in a pager, which provides # an `__iter__` convenience method. response = pagers.ListDatabasesPager( - method=rpc, request=request, response=response, metadata=metadata, + method=rpc, + request=request, + response=response, + metadata=metadata, ) # Done; return the response. @@ -712,7 +760,12 @@ def sample_create_database(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Wrap the response in an operation future. response = operation.from_gapic( @@ -809,7 +862,12 @@ def sample_get_database(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -951,7 +1009,12 @@ def sample_update_database_ddl(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Wrap the response in an operation future. response = operation.from_gapic( @@ -1043,7 +1106,10 @@ def sample_drop_database(): # Send the request. rpc( - request, retry=retry, timeout=timeout, metadata=metadata, + request, + retry=retry, + timeout=timeout, + metadata=metadata, ) def get_database_ddl( @@ -1136,7 +1202,12 @@ def sample_get_database_ddl(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1289,7 +1360,12 @@ def sample_set_iam_policy(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1443,7 +1519,12 @@ def sample_get_iam_policy(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1555,7 +1636,12 @@ def sample_test_iam_permissions(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1691,7 +1777,12 @@ def sample_create_backup(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Wrap the response in an operation future. response = operation.from_gapic( @@ -1853,7 +1944,12 @@ def sample_copy_backup(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Wrap the response in an operation future. response = operation.from_gapic( @@ -1951,7 +2047,12 @@ def sample_get_backup(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -2061,7 +2162,12 @@ def sample_update_backup(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -2146,7 +2252,10 @@ def sample_delete_backup(): # Send the request. rpc( - request, retry=retry, timeout=timeout, metadata=metadata, + request, + retry=retry, + timeout=timeout, + metadata=metadata, ) def list_backups( @@ -2241,12 +2350,20 @@ def sample_list_backups(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # This method is paged; wrap the response in a pager, which provides # an `__iter__` convenience method. response = pagers.ListBackupsPager( - method=rpc, request=request, response=response, metadata=metadata, + method=rpc, + request=request, + response=response, + metadata=metadata, ) # Done; return the response. @@ -2392,7 +2509,12 @@ def sample_restore_database(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Wrap the response in an operation future. response = operation.from_gapic( @@ -2509,12 +2631,20 @@ def sample_list_database_operations(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # This method is paged; wrap the response in a pager, which provides # an `__iter__` convenience method. response = pagers.ListDatabaseOperationsPager( - method=rpc, request=request, response=response, metadata=metadata, + method=rpc, + request=request, + response=response, + metadata=metadata, ) # Done; return the response. @@ -2622,12 +2752,20 @@ def sample_list_backup_operations(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # This method is paged; wrap the response in a pager, which provides # an `__iter__` convenience method. response = pagers.ListBackupOperationsPager( - method=rpc, request=request, response=response, metadata=metadata, + method=rpc, + request=request, + response=response, + metadata=metadata, ) # Done; return the response. diff --git a/google/cloud/spanner_admin_database_v1/services/database_admin/transports/base.py b/google/cloud/spanner_admin_database_v1/services/database_admin/transports/base.py index 18dfc4074c..21f27aeaf6 100644 --- a/google/cloud/spanner_admin_database_v1/services/database_admin/transports/base.py +++ b/google/cloud/spanner_admin_database_v1/services/database_admin/transports/base.py @@ -146,7 +146,9 @@ def _prep_wrapped_messages(self, client_info): client_info=client_info, ), self.create_database: gapic_v1.method.wrap_method( - self.create_database, default_timeout=3600.0, client_info=client_info, + self.create_database, + default_timeout=3600.0, + client_info=client_info, ), self.get_database: gapic_v1.method.wrap_method( self.get_database, @@ -209,7 +211,9 @@ def _prep_wrapped_messages(self, client_info): client_info=client_info, ), self.set_iam_policy: gapic_v1.method.wrap_method( - self.set_iam_policy, default_timeout=30.0, client_info=client_info, + self.set_iam_policy, + default_timeout=30.0, + client_info=client_info, ), self.get_iam_policy: gapic_v1.method.wrap_method( self.get_iam_policy, @@ -232,10 +236,14 @@ def _prep_wrapped_messages(self, client_info): client_info=client_info, ), self.create_backup: gapic_v1.method.wrap_method( - self.create_backup, default_timeout=3600.0, client_info=client_info, + self.create_backup, + default_timeout=3600.0, + client_info=client_info, ), self.copy_backup: gapic_v1.method.wrap_method( - self.copy_backup, default_timeout=3600.0, client_info=client_info, + self.copy_backup, + default_timeout=3600.0, + client_info=client_info, ), self.get_backup: gapic_v1.method.wrap_method( self.get_backup, @@ -298,7 +306,9 @@ def _prep_wrapped_messages(self, client_info): client_info=client_info, ), self.restore_database: gapic_v1.method.wrap_method( - self.restore_database, default_timeout=3600.0, client_info=client_info, + self.restore_database, + default_timeout=3600.0, + client_info=client_info, ), self.list_database_operations: gapic_v1.method.wrap_method( self.list_database_operations, @@ -335,9 +345,9 @@ def _prep_wrapped_messages(self, client_info): def close(self): """Closes resources associated with the transport. - .. warning:: - Only call this method if the transport is NOT shared - with other clients - this may cause errors in other clients! + .. warning:: + Only call this method if the transport is NOT shared + with other clients - this may cause errors in other clients! """ raise NotImplementedError() diff --git a/google/cloud/spanner_admin_database_v1/services/database_admin/transports/grpc.py b/google/cloud/spanner_admin_database_v1/services/database_admin/transports/grpc.py index 6f1d695122..70b1c8158a 100644 --- a/google/cloud/spanner_admin_database_v1/services/database_admin/transports/grpc.py +++ b/google/cloud/spanner_admin_database_v1/services/database_admin/transports/grpc.py @@ -239,8 +239,7 @@ def create_channel( @property def grpc_channel(self) -> grpc.Channel: - """Return the channel designed to connect to this service. - """ + """Return the channel designed to connect to this service.""" return self._grpc_channel @property diff --git a/google/cloud/spanner_admin_database_v1/types/backup.py b/google/cloud/spanner_admin_database_v1/types/backup.py index b4cff201a2..dd42c409b9 100644 --- a/google/cloud/spanner_admin_database_v1/types/backup.py +++ b/google/cloud/spanner_admin_database_v1/types/backup.py @@ -135,23 +135,60 @@ class State(proto.Enum): CREATING = 1 READY = 2 - database = proto.Field(proto.STRING, number=2,) + database = proto.Field( + proto.STRING, + number=2, + ) version_time = proto.Field( - proto.MESSAGE, number=9, message=timestamp_pb2.Timestamp, - ) - expire_time = proto.Field(proto.MESSAGE, number=3, message=timestamp_pb2.Timestamp,) - name = proto.Field(proto.STRING, number=1,) - create_time = proto.Field(proto.MESSAGE, number=4, message=timestamp_pb2.Timestamp,) - size_bytes = proto.Field(proto.INT64, number=5,) - state = proto.Field(proto.ENUM, number=6, enum=State,) - referencing_databases = proto.RepeatedField(proto.STRING, number=7,) + proto.MESSAGE, + number=9, + message=timestamp_pb2.Timestamp, + ) + expire_time = proto.Field( + proto.MESSAGE, + number=3, + message=timestamp_pb2.Timestamp, + ) + name = proto.Field( + proto.STRING, + number=1, + ) + create_time = proto.Field( + proto.MESSAGE, + number=4, + message=timestamp_pb2.Timestamp, + ) + size_bytes = proto.Field( + proto.INT64, + number=5, + ) + state = proto.Field( + proto.ENUM, + number=6, + enum=State, + ) + referencing_databases = proto.RepeatedField( + proto.STRING, + number=7, + ) encryption_info = proto.Field( - proto.MESSAGE, number=8, message=common.EncryptionInfo, + proto.MESSAGE, + number=8, + message=common.EncryptionInfo, + ) + database_dialect = proto.Field( + proto.ENUM, + number=10, + enum=common.DatabaseDialect, + ) + referencing_backups = proto.RepeatedField( + proto.STRING, + number=11, ) - database_dialect = proto.Field(proto.ENUM, number=10, enum=common.DatabaseDialect,) - referencing_backups = proto.RepeatedField(proto.STRING, number=11,) max_expire_time = proto.Field( - proto.MESSAGE, number=12, message=timestamp_pb2.Timestamp, + proto.MESSAGE, + number=12, + message=timestamp_pb2.Timestamp, ) @@ -183,11 +220,23 @@ class CreateBackupRequest(proto.Message): = ``USE_DATABASE_ENCRYPTION``. """ - parent = proto.Field(proto.STRING, number=1,) - backup_id = proto.Field(proto.STRING, number=2,) - backup = proto.Field(proto.MESSAGE, number=3, message="Backup",) + parent = proto.Field( + proto.STRING, + number=1, + ) + backup_id = proto.Field( + proto.STRING, + number=2, + ) + backup = proto.Field( + proto.MESSAGE, + number=3, + message="Backup", + ) encryption_config = proto.Field( - proto.MESSAGE, number=4, message="CreateBackupEncryptionConfig", + proto.MESSAGE, + number=4, + message="CreateBackupEncryptionConfig", ) @@ -222,10 +271,24 @@ class CreateBackupMetadata(proto.Message): 1, corresponding to ``Code.CANCELLED``. """ - name = proto.Field(proto.STRING, number=1,) - database = proto.Field(proto.STRING, number=2,) - progress = proto.Field(proto.MESSAGE, number=3, message=common.OperationProgress,) - cancel_time = proto.Field(proto.MESSAGE, number=4, message=timestamp_pb2.Timestamp,) + name = proto.Field( + proto.STRING, + number=1, + ) + database = proto.Field( + proto.STRING, + number=2, + ) + progress = proto.Field( + proto.MESSAGE, + number=3, + message=common.OperationProgress, + ) + cancel_time = proto.Field( + proto.MESSAGE, + number=4, + message=timestamp_pb2.Timestamp, + ) class CopyBackupRequest(proto.Message): @@ -264,12 +327,27 @@ class CopyBackupRequest(proto.Message): = ``USE_CONFIG_DEFAULT_OR_BACKUP_ENCRYPTION``. """ - parent = proto.Field(proto.STRING, number=1,) - backup_id = proto.Field(proto.STRING, number=2,) - source_backup = proto.Field(proto.STRING, number=3,) - expire_time = proto.Field(proto.MESSAGE, number=4, message=timestamp_pb2.Timestamp,) + parent = proto.Field( + proto.STRING, + number=1, + ) + backup_id = proto.Field( + proto.STRING, + number=2, + ) + source_backup = proto.Field( + proto.STRING, + number=3, + ) + expire_time = proto.Field( + proto.MESSAGE, + number=4, + message=timestamp_pb2.Timestamp, + ) encryption_config = proto.Field( - proto.MESSAGE, number=5, message="CopyBackupEncryptionConfig", + proto.MESSAGE, + number=5, + message="CopyBackupEncryptionConfig", ) @@ -307,10 +385,24 @@ class CopyBackupMetadata(proto.Message): 1, corresponding to ``Code.CANCELLED``. """ - name = proto.Field(proto.STRING, number=1,) - source_backup = proto.Field(proto.STRING, number=2,) - progress = proto.Field(proto.MESSAGE, number=3, message=common.OperationProgress,) - cancel_time = proto.Field(proto.MESSAGE, number=4, message=timestamp_pb2.Timestamp,) + name = proto.Field( + proto.STRING, + number=1, + ) + source_backup = proto.Field( + proto.STRING, + number=2, + ) + progress = proto.Field( + proto.MESSAGE, + number=3, + message=common.OperationProgress, + ) + cancel_time = proto.Field( + proto.MESSAGE, + number=4, + message=timestamp_pb2.Timestamp, + ) class UpdateBackupRequest(proto.Message): @@ -334,9 +426,15 @@ class UpdateBackupRequest(proto.Message): accidentally by clients that do not know about them. """ - backup = proto.Field(proto.MESSAGE, number=1, message="Backup",) + backup = proto.Field( + proto.MESSAGE, + number=1, + message="Backup", + ) update_mask = proto.Field( - proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask, + proto.MESSAGE, + number=2, + message=field_mask_pb2.FieldMask, ) @@ -350,7 +448,10 @@ class GetBackupRequest(proto.Message): ``projects//instances//backups/``. """ - name = proto.Field(proto.STRING, number=1,) + name = proto.Field( + proto.STRING, + number=1, + ) class DeleteBackupRequest(proto.Message): @@ -364,7 +465,10 @@ class DeleteBackupRequest(proto.Message): ``projects//instances//backups/``. """ - name = proto.Field(proto.STRING, number=1,) + name = proto.Field( + proto.STRING, + number=1, + ) class ListBackupsRequest(proto.Message): @@ -434,10 +538,22 @@ class ListBackupsRequest(proto.Message): to the same ``parent`` and with the same ``filter``. """ - parent = proto.Field(proto.STRING, number=1,) - filter = proto.Field(proto.STRING, number=2,) - page_size = proto.Field(proto.INT32, number=3,) - page_token = proto.Field(proto.STRING, number=4,) + parent = proto.Field( + proto.STRING, + number=1, + ) + filter = proto.Field( + proto.STRING, + number=2, + ) + page_size = proto.Field( + proto.INT32, + number=3, + ) + page_token = proto.Field( + proto.STRING, + number=4, + ) class ListBackupsResponse(proto.Message): @@ -459,8 +575,15 @@ class ListBackupsResponse(proto.Message): def raw_page(self): return self - backups = proto.RepeatedField(proto.MESSAGE, number=1, message="Backup",) - next_page_token = proto.Field(proto.STRING, number=2,) + backups = proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Backup", + ) + next_page_token = proto.Field( + proto.STRING, + number=2, + ) class ListBackupOperationsRequest(proto.Message): @@ -571,10 +694,22 @@ class ListBackupOperationsRequest(proto.Message): to the same ``parent`` and with the same ``filter``. """ - parent = proto.Field(proto.STRING, number=1,) - filter = proto.Field(proto.STRING, number=2,) - page_size = proto.Field(proto.INT32, number=3,) - page_token = proto.Field(proto.STRING, number=4,) + parent = proto.Field( + proto.STRING, + number=1, + ) + filter = proto.Field( + proto.STRING, + number=2, + ) + page_size = proto.Field( + proto.INT32, + number=3, + ) + page_token = proto.Field( + proto.STRING, + number=4, + ) class ListBackupOperationsResponse(proto.Message): @@ -605,9 +740,14 @@ def raw_page(self): return self operations = proto.RepeatedField( - proto.MESSAGE, number=1, message=operations_pb2.Operation, + proto.MESSAGE, + number=1, + message=operations_pb2.Operation, + ) + next_page_token = proto.Field( + proto.STRING, + number=2, ) - next_page_token = proto.Field(proto.STRING, number=2,) class BackupInfo(proto.Message): @@ -633,12 +773,24 @@ class BackupInfo(proto.Message): from. """ - backup = proto.Field(proto.STRING, number=1,) + backup = proto.Field( + proto.STRING, + number=1, + ) version_time = proto.Field( - proto.MESSAGE, number=4, message=timestamp_pb2.Timestamp, + proto.MESSAGE, + number=4, + message=timestamp_pb2.Timestamp, + ) + create_time = proto.Field( + proto.MESSAGE, + number=2, + message=timestamp_pb2.Timestamp, + ) + source_database = proto.Field( + proto.STRING, + number=3, ) - create_time = proto.Field(proto.MESSAGE, number=2, message=timestamp_pb2.Timestamp,) - source_database = proto.Field(proto.STRING, number=3,) class CreateBackupEncryptionConfig(proto.Message): @@ -662,8 +814,15 @@ class EncryptionType(proto.Enum): GOOGLE_DEFAULT_ENCRYPTION = 2 CUSTOMER_MANAGED_ENCRYPTION = 3 - encryption_type = proto.Field(proto.ENUM, number=1, enum=EncryptionType,) - kms_key_name = proto.Field(proto.STRING, number=2,) + encryption_type = proto.Field( + proto.ENUM, + number=1, + enum=EncryptionType, + ) + kms_key_name = proto.Field( + proto.STRING, + number=2, + ) class CopyBackupEncryptionConfig(proto.Message): @@ -687,8 +846,15 @@ class EncryptionType(proto.Enum): GOOGLE_DEFAULT_ENCRYPTION = 2 CUSTOMER_MANAGED_ENCRYPTION = 3 - encryption_type = proto.Field(proto.ENUM, number=1, enum=EncryptionType,) - kms_key_name = proto.Field(proto.STRING, number=2,) + encryption_type = proto.Field( + proto.ENUM, + number=1, + enum=EncryptionType, + ) + kms_key_name = proto.Field( + proto.STRING, + number=2, + ) __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/google/cloud/spanner_admin_database_v1/types/common.py b/google/cloud/spanner_admin_database_v1/types/common.py index 8e5e4aa9f4..6475e588bc 100644 --- a/google/cloud/spanner_admin_database_v1/types/common.py +++ b/google/cloud/spanner_admin_database_v1/types/common.py @@ -52,9 +52,20 @@ class OperationProgress(proto.Message): failed or was completed successfully. """ - progress_percent = proto.Field(proto.INT32, number=1,) - start_time = proto.Field(proto.MESSAGE, number=2, message=timestamp_pb2.Timestamp,) - end_time = proto.Field(proto.MESSAGE, number=3, message=timestamp_pb2.Timestamp,) + progress_percent = proto.Field( + proto.INT32, + number=1, + ) + start_time = proto.Field( + proto.MESSAGE, + number=2, + message=timestamp_pb2.Timestamp, + ) + end_time = proto.Field( + proto.MESSAGE, + number=3, + message=timestamp_pb2.Timestamp, + ) class EncryptionConfig(proto.Message): @@ -67,7 +78,10 @@ class EncryptionConfig(proto.Message): ``projects//locations//keyRings//cryptoKeys/``. """ - kms_key_name = proto.Field(proto.STRING, number=2,) + kms_key_name = proto.Field( + proto.STRING, + number=2, + ) class EncryptionInfo(proto.Message): @@ -93,9 +107,20 @@ class Type(proto.Enum): GOOGLE_DEFAULT_ENCRYPTION = 1 CUSTOMER_MANAGED_ENCRYPTION = 2 - encryption_type = proto.Field(proto.ENUM, number=3, enum=Type,) - encryption_status = proto.Field(proto.MESSAGE, number=4, message=status_pb2.Status,) - kms_key_version = proto.Field(proto.STRING, number=2,) + encryption_type = proto.Field( + proto.ENUM, + number=3, + enum=Type, + ) + encryption_status = proto.Field( + proto.MESSAGE, + number=4, + message=status_pb2.Status, + ) + kms_key_version = proto.Field( + proto.STRING, + number=2, + ) __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/google/cloud/spanner_admin_database_v1/types/spanner_database_admin.py b/google/cloud/spanner_admin_database_v1/types/spanner_database_admin.py index c9c519334b..52521db98d 100644 --- a/google/cloud/spanner_admin_database_v1/types/spanner_database_admin.py +++ b/google/cloud/spanner_admin_database_v1/types/spanner_database_admin.py @@ -68,9 +68,16 @@ class RestoreInfo(proto.Message): This field is a member of `oneof`_ ``source_info``. """ - source_type = proto.Field(proto.ENUM, number=1, enum="RestoreSourceType",) + source_type = proto.Field( + proto.ENUM, + number=1, + enum="RestoreSourceType", + ) backup_info = proto.Field( - proto.MESSAGE, number=2, oneof="source_info", message=gsad_backup.BackupInfo, + proto.MESSAGE, + number=2, + oneof="source_info", + message=gsad_backup.BackupInfo, ) @@ -147,22 +154,53 @@ class State(proto.Enum): READY = 2 READY_OPTIMIZING = 3 - name = proto.Field(proto.STRING, number=1,) - state = proto.Field(proto.ENUM, number=2, enum=State,) - create_time = proto.Field(proto.MESSAGE, number=3, message=timestamp_pb2.Timestamp,) - restore_info = proto.Field(proto.MESSAGE, number=4, message="RestoreInfo",) + name = proto.Field( + proto.STRING, + number=1, + ) + state = proto.Field( + proto.ENUM, + number=2, + enum=State, + ) + create_time = proto.Field( + proto.MESSAGE, + number=3, + message=timestamp_pb2.Timestamp, + ) + restore_info = proto.Field( + proto.MESSAGE, + number=4, + message="RestoreInfo", + ) encryption_config = proto.Field( - proto.MESSAGE, number=5, message=common.EncryptionConfig, + proto.MESSAGE, + number=5, + message=common.EncryptionConfig, ) encryption_info = proto.RepeatedField( - proto.MESSAGE, number=8, message=common.EncryptionInfo, + proto.MESSAGE, + number=8, + message=common.EncryptionInfo, + ) + version_retention_period = proto.Field( + proto.STRING, + number=6, ) - version_retention_period = proto.Field(proto.STRING, number=6,) earliest_version_time = proto.Field( - proto.MESSAGE, number=7, message=timestamp_pb2.Timestamp, + proto.MESSAGE, + number=7, + message=timestamp_pb2.Timestamp, + ) + default_leader = proto.Field( + proto.STRING, + number=9, + ) + database_dialect = proto.Field( + proto.ENUM, + number=10, + enum=common.DatabaseDialect, ) - default_leader = proto.Field(proto.STRING, number=9,) - database_dialect = proto.Field(proto.ENUM, number=10, enum=common.DatabaseDialect,) class ListDatabasesRequest(proto.Message): @@ -185,9 +223,18 @@ class ListDatabasesRequest(proto.Message): [ListDatabasesResponse][google.spanner.admin.database.v1.ListDatabasesResponse]. """ - parent = proto.Field(proto.STRING, number=1,) - page_size = proto.Field(proto.INT32, number=3,) - page_token = proto.Field(proto.STRING, number=4,) + parent = proto.Field( + proto.STRING, + number=1, + ) + page_size = proto.Field( + proto.INT32, + number=3, + ) + page_token = proto.Field( + proto.STRING, + number=4, + ) class ListDatabasesResponse(proto.Message): @@ -207,8 +254,15 @@ class ListDatabasesResponse(proto.Message): def raw_page(self): return self - databases = proto.RepeatedField(proto.MESSAGE, number=1, message="Database",) - next_page_token = proto.Field(proto.STRING, number=2,) + databases = proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Database", + ) + next_page_token = proto.Field( + proto.STRING, + number=2, + ) class CreateDatabaseRequest(proto.Message): @@ -244,13 +298,28 @@ class CreateDatabaseRequest(proto.Message): Database. """ - parent = proto.Field(proto.STRING, number=1,) - create_statement = proto.Field(proto.STRING, number=2,) - extra_statements = proto.RepeatedField(proto.STRING, number=3,) + parent = proto.Field( + proto.STRING, + number=1, + ) + create_statement = proto.Field( + proto.STRING, + number=2, + ) + extra_statements = proto.RepeatedField( + proto.STRING, + number=3, + ) encryption_config = proto.Field( - proto.MESSAGE, number=4, message=common.EncryptionConfig, + proto.MESSAGE, + number=4, + message=common.EncryptionConfig, + ) + database_dialect = proto.Field( + proto.ENUM, + number=5, + enum=common.DatabaseDialect, ) - database_dialect = proto.Field(proto.ENUM, number=5, enum=common.DatabaseDialect,) class CreateDatabaseMetadata(proto.Message): @@ -262,7 +331,10 @@ class CreateDatabaseMetadata(proto.Message): The database being created. """ - database = proto.Field(proto.STRING, number=1,) + database = proto.Field( + proto.STRING, + number=1, + ) class GetDatabaseRequest(proto.Message): @@ -276,7 +348,10 @@ class GetDatabaseRequest(proto.Message): ``projects//instances//databases/``. """ - name = proto.Field(proto.STRING, number=1,) + name = proto.Field( + proto.STRING, + number=1, + ) class UpdateDatabaseDdlRequest(proto.Message): @@ -327,9 +402,18 @@ class UpdateDatabaseDdlRequest(proto.Message): returns ``ALREADY_EXISTS``. """ - database = proto.Field(proto.STRING, number=1,) - statements = proto.RepeatedField(proto.STRING, number=2,) - operation_id = proto.Field(proto.STRING, number=3,) + database = proto.Field( + proto.STRING, + number=1, + ) + statements = proto.RepeatedField( + proto.STRING, + number=2, + ) + operation_id = proto.Field( + proto.STRING, + number=3, + ) class UpdateDatabaseDdlMetadata(proto.Message): @@ -365,14 +449,27 @@ class UpdateDatabaseDdlMetadata(proto.Message): ``statements[i]``. """ - database = proto.Field(proto.STRING, number=1,) - statements = proto.RepeatedField(proto.STRING, number=2,) + database = proto.Field( + proto.STRING, + number=1, + ) + statements = proto.RepeatedField( + proto.STRING, + number=2, + ) commit_timestamps = proto.RepeatedField( - proto.MESSAGE, number=3, message=timestamp_pb2.Timestamp, + proto.MESSAGE, + number=3, + message=timestamp_pb2.Timestamp, + ) + throttled = proto.Field( + proto.BOOL, + number=4, ) - throttled = proto.Field(proto.BOOL, number=4,) progress = proto.RepeatedField( - proto.MESSAGE, number=5, message=common.OperationProgress, + proto.MESSAGE, + number=5, + message=common.OperationProgress, ) @@ -385,7 +482,10 @@ class DropDatabaseRequest(proto.Message): Required. The database to be dropped. """ - database = proto.Field(proto.STRING, number=1,) + database = proto.Field( + proto.STRING, + number=1, + ) class GetDatabaseDdlRequest(proto.Message): @@ -399,7 +499,10 @@ class GetDatabaseDdlRequest(proto.Message): ``projects//instances//databases/`` """ - database = proto.Field(proto.STRING, number=1,) + database = proto.Field( + proto.STRING, + number=1, + ) class GetDatabaseDdlResponse(proto.Message): @@ -413,7 +516,10 @@ class GetDatabaseDdlResponse(proto.Message): request. """ - statements = proto.RepeatedField(proto.STRING, number=1,) + statements = proto.RepeatedField( + proto.STRING, + number=1, + ) class ListDatabaseOperationsRequest(proto.Message): @@ -488,10 +594,22 @@ class ListDatabaseOperationsRequest(proto.Message): to the same ``parent`` and with the same ``filter``. """ - parent = proto.Field(proto.STRING, number=1,) - filter = proto.Field(proto.STRING, number=2,) - page_size = proto.Field(proto.INT32, number=3,) - page_token = proto.Field(proto.STRING, number=4,) + parent = proto.Field( + proto.STRING, + number=1, + ) + filter = proto.Field( + proto.STRING, + number=2, + ) + page_size = proto.Field( + proto.INT32, + number=3, + ) + page_token = proto.Field( + proto.STRING, + number=4, + ) class ListDatabaseOperationsResponse(proto.Message): @@ -517,9 +635,14 @@ def raw_page(self): return self operations = proto.RepeatedField( - proto.MESSAGE, number=1, message=operations_pb2.Operation, + proto.MESSAGE, + number=1, + message=operations_pb2.Operation, + ) + next_page_token = proto.Field( + proto.STRING, + number=2, ) - next_page_token = proto.Field(proto.STRING, number=2,) class RestoreDatabaseRequest(proto.Message): @@ -558,11 +681,23 @@ class RestoreDatabaseRequest(proto.Message): = ``USE_CONFIG_DEFAULT_OR_BACKUP_ENCRYPTION``. """ - parent = proto.Field(proto.STRING, number=1,) - database_id = proto.Field(proto.STRING, number=2,) - backup = proto.Field(proto.STRING, number=3, oneof="source",) + parent = proto.Field( + proto.STRING, + number=1, + ) + database_id = proto.Field( + proto.STRING, + number=2, + ) + backup = proto.Field( + proto.STRING, + number=3, + oneof="source", + ) encryption_config = proto.Field( - proto.MESSAGE, number=4, message="RestoreDatabaseEncryptionConfig", + proto.MESSAGE, + number=4, + message="RestoreDatabaseEncryptionConfig", ) @@ -589,8 +724,15 @@ class EncryptionType(proto.Enum): GOOGLE_DEFAULT_ENCRYPTION = 2 CUSTOMER_MANAGED_ENCRYPTION = 3 - encryption_type = proto.Field(proto.ENUM, number=1, enum=EncryptionType,) - kms_key_name = proto.Field(proto.STRING, number=2,) + encryption_type = proto.Field( + proto.ENUM, + number=1, + enum=EncryptionType, + ) + kms_key_name = proto.Field( + proto.STRING, + number=2, + ) class RestoreDatabaseMetadata(proto.Message): @@ -646,14 +788,35 @@ class RestoreDatabaseMetadata(proto.Message): if the restore was not successful. """ - name = proto.Field(proto.STRING, number=1,) - source_type = proto.Field(proto.ENUM, number=2, enum="RestoreSourceType",) + name = proto.Field( + proto.STRING, + number=1, + ) + source_type = proto.Field( + proto.ENUM, + number=2, + enum="RestoreSourceType", + ) backup_info = proto.Field( - proto.MESSAGE, number=3, oneof="source_info", message=gsad_backup.BackupInfo, + proto.MESSAGE, + number=3, + oneof="source_info", + message=gsad_backup.BackupInfo, + ) + progress = proto.Field( + proto.MESSAGE, + number=4, + message=common.OperationProgress, + ) + cancel_time = proto.Field( + proto.MESSAGE, + number=5, + message=timestamp_pb2.Timestamp, + ) + optimize_database_operation_name = proto.Field( + proto.STRING, + number=6, ) - progress = proto.Field(proto.MESSAGE, number=4, message=common.OperationProgress,) - cancel_time = proto.Field(proto.MESSAGE, number=5, message=timestamp_pb2.Timestamp,) - optimize_database_operation_name = proto.Field(proto.STRING, number=6,) class OptimizeRestoredDatabaseMetadata(proto.Message): @@ -672,8 +835,15 @@ class OptimizeRestoredDatabaseMetadata(proto.Message): optimizations. """ - name = proto.Field(proto.STRING, number=1,) - progress = proto.Field(proto.MESSAGE, number=2, message=common.OperationProgress,) + name = proto.Field( + proto.STRING, + number=1, + ) + progress = proto.Field( + proto.MESSAGE, + number=2, + message=common.OperationProgress, + ) __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/google/cloud/spanner_admin_instance_v1/services/instance_admin/async_client.py b/google/cloud/spanner_admin_instance_v1/services/instance_admin/async_client.py index 2d8a01afb7..1d79ac996e 100644 --- a/google/cloud/spanner_admin_instance_v1/services/instance_admin/async_client.py +++ b/google/cloud/spanner_admin_instance_v1/services/instance_admin/async_client.py @@ -334,12 +334,20 @@ def sample_list_instance_configs(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # This method is paged; wrap the response in a pager, which provides # an `__aiter__` convenience method. response = pagers.ListInstanceConfigsAsyncPager( - method=rpc, request=request, response=response, metadata=metadata, + method=rpc, + request=request, + response=response, + metadata=metadata, ) # Done; return the response. @@ -445,7 +453,12 @@ def sample_get_instance_config(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -550,12 +563,20 @@ def sample_list_instances(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # This method is paged; wrap the response in a pager, which provides # an `__aiter__` convenience method. response = pagers.ListInstancesAsyncPager( - method=rpc, request=request, response=response, metadata=metadata, + method=rpc, + request=request, + response=response, + metadata=metadata, ) # Done; return the response. @@ -657,7 +678,12 @@ def sample_get_instance(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -822,7 +848,12 @@ def sample_create_instance(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Wrap the response in an operation future. response = operation_async.from_gapic( @@ -998,7 +1029,12 @@ def sample_update_instance(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Wrap the response in an operation future. response = operation_async.from_gapic( @@ -1110,7 +1146,10 @@ def sample_delete_instance(): # Send the request. await rpc( - request, retry=retry, timeout=timeout, metadata=metadata, + request, + retry=retry, + timeout=timeout, + metadata=metadata, ) async def set_iam_policy( @@ -1241,7 +1280,9 @@ def sample_set_iam_policy(): if isinstance(request, dict): request = iam_policy_pb2.SetIamPolicyRequest(**request) elif not request: - request = iam_policy_pb2.SetIamPolicyRequest(resource=resource,) + request = iam_policy_pb2.SetIamPolicyRequest( + resource=resource, + ) # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1258,7 +1299,12 @@ def sample_set_iam_policy(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1392,7 +1438,9 @@ def sample_get_iam_policy(): if isinstance(request, dict): request = iam_policy_pb2.GetIamPolicyRequest(**request) elif not request: - request = iam_policy_pb2.GetIamPolicyRequest(resource=resource,) + request = iam_policy_pb2.GetIamPolicyRequest( + resource=resource, + ) # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -1419,7 +1467,12 @@ def sample_get_iam_policy(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1511,7 +1564,8 @@ def sample_test_iam_permissions(): request = iam_policy_pb2.TestIamPermissionsRequest(**request) elif not request: request = iam_policy_pb2.TestIamPermissionsRequest( - resource=resource, permissions=permissions, + resource=resource, + permissions=permissions, ) # Wrap the RPC method; this adds retry and timeout information, @@ -1529,7 +1583,12 @@ def sample_test_iam_permissions(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response diff --git a/google/cloud/spanner_admin_instance_v1/services/instance_admin/client.py b/google/cloud/spanner_admin_instance_v1/services/instance_admin/client.py index 89eb1c5e68..1ebf127487 100644 --- a/google/cloud/spanner_admin_instance_v1/services/instance_admin/client.py +++ b/google/cloud/spanner_admin_instance_v1/services/instance_admin/client.py @@ -58,7 +58,10 @@ class InstanceAdminClientMeta(type): _transport_registry["grpc"] = InstanceAdminGrpcTransport _transport_registry["grpc_asyncio"] = InstanceAdminGrpcAsyncIOTransport - def get_transport_class(cls, label: str = None,) -> Type[InstanceAdminTransport]: + def get_transport_class( + cls, + label: str = None, + ) -> Type[InstanceAdminTransport]: """Returns an appropriate transport class. Args: @@ -184,10 +187,14 @@ def transport(self) -> InstanceAdminTransport: return self._transport @staticmethod - def instance_path(project: str, instance: str,) -> str: + def instance_path( + project: str, + instance: str, + ) -> str: """Returns a fully-qualified instance string.""" return "projects/{project}/instances/{instance}".format( - project=project, instance=instance, + project=project, + instance=instance, ) @staticmethod @@ -197,10 +204,14 @@ def parse_instance_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def instance_config_path(project: str, instance_config: str,) -> str: + def instance_config_path( + project: str, + instance_config: str, + ) -> str: """Returns a fully-qualified instance_config string.""" return "projects/{project}/instanceConfigs/{instance_config}".format( - project=project, instance_config=instance_config, + project=project, + instance_config=instance_config, ) @staticmethod @@ -213,7 +224,9 @@ def parse_instance_config_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_billing_account_path(billing_account: str,) -> str: + def common_billing_account_path( + billing_account: str, + ) -> str: """Returns a fully-qualified billing_account string.""" return "billingAccounts/{billing_account}".format( billing_account=billing_account, @@ -226,9 +239,13 @@ def parse_common_billing_account_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_folder_path(folder: str,) -> str: + def common_folder_path( + folder: str, + ) -> str: """Returns a fully-qualified folder string.""" - return "folders/{folder}".format(folder=folder,) + return "folders/{folder}".format( + folder=folder, + ) @staticmethod def parse_common_folder_path(path: str) -> Dict[str, str]: @@ -237,9 +254,13 @@ def parse_common_folder_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_organization_path(organization: str,) -> str: + def common_organization_path( + organization: str, + ) -> str: """Returns a fully-qualified organization string.""" - return "organizations/{organization}".format(organization=organization,) + return "organizations/{organization}".format( + organization=organization, + ) @staticmethod def parse_common_organization_path(path: str) -> Dict[str, str]: @@ -248,9 +269,13 @@ def parse_common_organization_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_project_path(project: str,) -> str: + def common_project_path( + project: str, + ) -> str: """Returns a fully-qualified project string.""" - return "projects/{project}".format(project=project,) + return "projects/{project}".format( + project=project, + ) @staticmethod def parse_common_project_path(path: str) -> Dict[str, str]: @@ -259,10 +284,14 @@ def parse_common_project_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_location_path(project: str, location: str,) -> str: + def common_location_path( + project: str, + location: str, + ) -> str: """Returns a fully-qualified location string.""" return "projects/{project}/locations/{location}".format( - project=project, location=location, + project=project, + location=location, ) @staticmethod @@ -528,12 +557,20 @@ def sample_list_instance_configs(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # This method is paged; wrap the response in a pager, which provides # an `__iter__` convenience method. response = pagers.ListInstanceConfigsPager( - method=rpc, request=request, response=response, metadata=metadata, + method=rpc, + request=request, + response=response, + metadata=metadata, ) # Done; return the response. @@ -629,7 +666,12 @@ def sample_get_instance_config(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -724,12 +766,20 @@ def sample_list_instances(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # This method is paged; wrap the response in a pager, which provides # an `__iter__` convenience method. response = pagers.ListInstancesPager( - method=rpc, request=request, response=response, metadata=metadata, + method=rpc, + request=request, + response=response, + metadata=metadata, ) # Done; return the response. @@ -821,7 +871,12 @@ def sample_get_instance(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -986,7 +1041,12 @@ def sample_create_instance(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Wrap the response in an operation future. response = operation.from_gapic( @@ -1162,7 +1222,12 @@ def sample_update_instance(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Wrap the response in an operation future. response = operation.from_gapic( @@ -1264,7 +1329,10 @@ def sample_delete_instance(): # Send the request. rpc( - request, retry=retry, timeout=timeout, metadata=metadata, + request, + retry=retry, + timeout=timeout, + metadata=metadata, ) def set_iam_policy( @@ -1411,7 +1479,12 @@ def sample_set_iam_policy(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1561,7 +1634,12 @@ def sample_get_iam_policy(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1670,7 +1748,12 @@ def sample_test_iam_permissions(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response diff --git a/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/base.py b/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/base.py index a6375d12b9..3f9888c363 100644 --- a/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/base.py +++ b/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/base.py @@ -189,10 +189,14 @@ def _prep_wrapped_messages(self, client_info): client_info=client_info, ), self.create_instance: gapic_v1.method.wrap_method( - self.create_instance, default_timeout=3600.0, client_info=client_info, + self.create_instance, + default_timeout=3600.0, + client_info=client_info, ), self.update_instance: gapic_v1.method.wrap_method( - self.update_instance, default_timeout=3600.0, client_info=client_info, + self.update_instance, + default_timeout=3600.0, + client_info=client_info, ), self.delete_instance: gapic_v1.method.wrap_method( self.delete_instance, @@ -210,7 +214,9 @@ def _prep_wrapped_messages(self, client_info): client_info=client_info, ), self.set_iam_policy: gapic_v1.method.wrap_method( - self.set_iam_policy, default_timeout=30.0, client_info=client_info, + self.set_iam_policy, + default_timeout=30.0, + client_info=client_info, ), self.get_iam_policy: gapic_v1.method.wrap_method( self.get_iam_policy, @@ -237,9 +243,9 @@ def _prep_wrapped_messages(self, client_info): def close(self): """Closes resources associated with the transport. - .. warning:: - Only call this method if the transport is NOT shared - with other clients - this may cause errors in other clients! + .. warning:: + Only call this method if the transport is NOT shared + with other clients - this may cause errors in other clients! """ raise NotImplementedError() diff --git a/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/grpc.py b/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/grpc.py index d6b043af68..012c2dce2e 100644 --- a/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/grpc.py +++ b/google/cloud/spanner_admin_instance_v1/services/instance_admin/transports/grpc.py @@ -250,8 +250,7 @@ def create_channel( @property def grpc_channel(self) -> grpc.Channel: - """Return the channel designed to connect to this service. - """ + """Return the channel designed to connect to this service.""" return self._grpc_channel @property diff --git a/google/cloud/spanner_admin_instance_v1/types/spanner_instance_admin.py b/google/cloud/spanner_admin_instance_v1/types/spanner_instance_admin.py index 56bf55a560..5b964a7935 100644 --- a/google/cloud/spanner_admin_instance_v1/types/spanner_instance_admin.py +++ b/google/cloud/spanner_admin_instance_v1/types/spanner_instance_admin.py @@ -67,9 +67,19 @@ class ReplicaType(proto.Enum): READ_ONLY = 2 WITNESS = 3 - location = proto.Field(proto.STRING, number=1,) - type_ = proto.Field(proto.ENUM, number=2, enum=ReplicaType,) - default_leader_location = proto.Field(proto.BOOL, number=3,) + location = proto.Field( + proto.STRING, + number=1, + ) + type_ = proto.Field( + proto.ENUM, + number=2, + enum=ReplicaType, + ) + default_leader_location = proto.Field( + proto.BOOL, + number=3, + ) class InstanceConfig(proto.Message): @@ -94,10 +104,23 @@ class InstanceConfig(proto.Message): databases in instances that use this instance configuration. """ - name = proto.Field(proto.STRING, number=1,) - display_name = proto.Field(proto.STRING, number=2,) - replicas = proto.RepeatedField(proto.MESSAGE, number=3, message="ReplicaInfo",) - leader_options = proto.RepeatedField(proto.STRING, number=4,) + name = proto.Field( + proto.STRING, + number=1, + ) + display_name = proto.Field( + proto.STRING, + number=2, + ) + replicas = proto.RepeatedField( + proto.MESSAGE, + number=3, + message="ReplicaInfo", + ) + leader_options = proto.RepeatedField( + proto.STRING, + number=4, + ) class Instance(proto.Message): @@ -183,14 +206,40 @@ class State(proto.Enum): CREATING = 1 READY = 2 - name = proto.Field(proto.STRING, number=1,) - config = proto.Field(proto.STRING, number=2,) - display_name = proto.Field(proto.STRING, number=3,) - node_count = proto.Field(proto.INT32, number=5,) - processing_units = proto.Field(proto.INT32, number=9,) - state = proto.Field(proto.ENUM, number=6, enum=State,) - labels = proto.MapField(proto.STRING, proto.STRING, number=7,) - endpoint_uris = proto.RepeatedField(proto.STRING, number=8,) + name = proto.Field( + proto.STRING, + number=1, + ) + config = proto.Field( + proto.STRING, + number=2, + ) + display_name = proto.Field( + proto.STRING, + number=3, + ) + node_count = proto.Field( + proto.INT32, + number=5, + ) + processing_units = proto.Field( + proto.INT32, + number=9, + ) + state = proto.Field( + proto.ENUM, + number=6, + enum=State, + ) + labels = proto.MapField( + proto.STRING, + proto.STRING, + number=7, + ) + endpoint_uris = proto.RepeatedField( + proto.STRING, + number=8, + ) class ListInstanceConfigsRequest(proto.Message): @@ -213,9 +262,18 @@ class ListInstanceConfigsRequest(proto.Message): [ListInstanceConfigsResponse][google.spanner.admin.instance.v1.ListInstanceConfigsResponse]. """ - parent = proto.Field(proto.STRING, number=1,) - page_size = proto.Field(proto.INT32, number=2,) - page_token = proto.Field(proto.STRING, number=3,) + parent = proto.Field( + proto.STRING, + number=1, + ) + page_size = proto.Field( + proto.INT32, + number=2, + ) + page_token = proto.Field( + proto.STRING, + number=3, + ) class ListInstanceConfigsResponse(proto.Message): @@ -237,9 +295,14 @@ def raw_page(self): return self instance_configs = proto.RepeatedField( - proto.MESSAGE, number=1, message="InstanceConfig", + proto.MESSAGE, + number=1, + message="InstanceConfig", + ) + next_page_token = proto.Field( + proto.STRING, + number=2, ) - next_page_token = proto.Field(proto.STRING, number=2,) class GetInstanceConfigRequest(proto.Message): @@ -253,7 +316,10 @@ class GetInstanceConfigRequest(proto.Message): ``projects//instanceConfigs/``. """ - name = proto.Field(proto.STRING, number=1,) + name = proto.Field( + proto.STRING, + number=1, + ) class GetInstanceRequest(proto.Message): @@ -272,8 +338,15 @@ class GetInstanceRequest(proto.Message): are returned. """ - name = proto.Field(proto.STRING, number=1,) - field_mask = proto.Field(proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask,) + name = proto.Field( + proto.STRING, + number=1, + ) + field_mask = proto.Field( + proto.MESSAGE, + number=2, + message=field_mask_pb2.FieldMask, + ) class CreateInstanceRequest(proto.Message): @@ -294,9 +367,19 @@ class CreateInstanceRequest(proto.Message): ``/instances/``. """ - parent = proto.Field(proto.STRING, number=1,) - instance_id = proto.Field(proto.STRING, number=2,) - instance = proto.Field(proto.MESSAGE, number=3, message="Instance",) + parent = proto.Field( + proto.STRING, + number=1, + ) + instance_id = proto.Field( + proto.STRING, + number=2, + ) + instance = proto.Field( + proto.MESSAGE, + number=3, + message="Instance", + ) class ListInstancesRequest(proto.Message): @@ -341,10 +424,22 @@ class ListInstancesRequest(proto.Message): containing "dev". """ - parent = proto.Field(proto.STRING, number=1,) - page_size = proto.Field(proto.INT32, number=2,) - page_token = proto.Field(proto.STRING, number=3,) - filter = proto.Field(proto.STRING, number=4,) + parent = proto.Field( + proto.STRING, + number=1, + ) + page_size = proto.Field( + proto.INT32, + number=2, + ) + page_token = proto.Field( + proto.STRING, + number=3, + ) + filter = proto.Field( + proto.STRING, + number=4, + ) class ListInstancesResponse(proto.Message): @@ -364,8 +459,15 @@ class ListInstancesResponse(proto.Message): def raw_page(self): return self - instances = proto.RepeatedField(proto.MESSAGE, number=1, message="Instance",) - next_page_token = proto.Field(proto.STRING, number=2,) + instances = proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Instance", + ) + next_page_token = proto.Field( + proto.STRING, + number=2, + ) class UpdateInstanceRequest(proto.Message): @@ -388,8 +490,16 @@ class UpdateInstanceRequest(proto.Message): them. """ - instance = proto.Field(proto.MESSAGE, number=1, message="Instance",) - field_mask = proto.Field(proto.MESSAGE, number=2, message=field_mask_pb2.FieldMask,) + instance = proto.Field( + proto.MESSAGE, + number=1, + message="Instance", + ) + field_mask = proto.Field( + proto.MESSAGE, + number=2, + message=field_mask_pb2.FieldMask, + ) class DeleteInstanceRequest(proto.Message): @@ -402,7 +512,10 @@ class DeleteInstanceRequest(proto.Message): of the form ``projects//instances/`` """ - name = proto.Field(proto.STRING, number=1,) + name = proto.Field( + proto.STRING, + number=1, + ) class CreateInstanceMetadata(proto.Message): @@ -426,10 +539,26 @@ class CreateInstanceMetadata(proto.Message): was completed successfully. """ - instance = proto.Field(proto.MESSAGE, number=1, message="Instance",) - start_time = proto.Field(proto.MESSAGE, number=2, message=timestamp_pb2.Timestamp,) - cancel_time = proto.Field(proto.MESSAGE, number=3, message=timestamp_pb2.Timestamp,) - end_time = proto.Field(proto.MESSAGE, number=4, message=timestamp_pb2.Timestamp,) + instance = proto.Field( + proto.MESSAGE, + number=1, + message="Instance", + ) + start_time = proto.Field( + proto.MESSAGE, + number=2, + message=timestamp_pb2.Timestamp, + ) + cancel_time = proto.Field( + proto.MESSAGE, + number=3, + message=timestamp_pb2.Timestamp, + ) + end_time = proto.Field( + proto.MESSAGE, + number=4, + message=timestamp_pb2.Timestamp, + ) class UpdateInstanceMetadata(proto.Message): @@ -453,10 +582,26 @@ class UpdateInstanceMetadata(proto.Message): was completed successfully. """ - instance = proto.Field(proto.MESSAGE, number=1, message="Instance",) - start_time = proto.Field(proto.MESSAGE, number=2, message=timestamp_pb2.Timestamp,) - cancel_time = proto.Field(proto.MESSAGE, number=3, message=timestamp_pb2.Timestamp,) - end_time = proto.Field(proto.MESSAGE, number=4, message=timestamp_pb2.Timestamp,) + instance = proto.Field( + proto.MESSAGE, + number=1, + message="Instance", + ) + start_time = proto.Field( + proto.MESSAGE, + number=2, + message=timestamp_pb2.Timestamp, + ) + cancel_time = proto.Field( + proto.MESSAGE, + number=3, + message=timestamp_pb2.Timestamp, + ) + end_time = proto.Field( + proto.MESSAGE, + number=4, + message=timestamp_pb2.Timestamp, + ) __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/google/cloud/spanner_dbapi/connection.py b/google/cloud/spanner_dbapi/connection.py index 0da0c15584..76f04338c4 100644 --- a/google/cloud/spanner_dbapi/connection.py +++ b/google/cloud/spanner_dbapi/connection.py @@ -446,7 +446,8 @@ def run_statement(self, statement, retried=False): ) else: _execute_insert_heterogenous( - transaction, parts.get("sql_params_list"), + transaction, + parts.get("sql_params_list"), ) return ( iter(()), @@ -455,7 +456,9 @@ def run_statement(self, statement, retried=False): return ( transaction.execute_sql( - statement.sql, statement.params, param_types=statement.param_types, + statement.sql, + statement.params, + param_types=statement.param_types, ), ResultsChecksum() if retried else statement.checksum, ) diff --git a/google/cloud/spanner_dbapi/cursor.py b/google/cloud/spanner_dbapi/cursor.py index 7c8c5bdbc5..0fc36a72a9 100644 --- a/google/cloud/spanner_dbapi/cursor.py +++ b/google/cloud/spanner_dbapi/cursor.py @@ -260,9 +260,10 @@ def execute(self, sql, args=None): class_ == parse_utils.STMT_INSERT, ) - (self._result_set, self._checksum,) = self.connection.run_statement( - statement - ) + ( + self._result_set, + self._checksum, + ) = self.connection.run_statement(statement) while True: try: self._itr = PeekIterator(self._result_set) diff --git a/google/cloud/spanner_v1/backup.py b/google/cloud/spanner_v1/backup.py index d7a97809f1..a7b7a972b6 100644 --- a/google/cloud/spanner_v1/backup.py +++ b/google/cloud/spanner_v1/backup.py @@ -295,7 +295,10 @@ def create(self): encryption_config=self._encryption_config, ) - future = api.copy_backup(request=request, metadata=metadata,) + future = api.copy_backup( + request=request, + metadata=metadata, + ) return future backup = BackupPB( @@ -311,7 +314,10 @@ def create(self): encryption_config=self._encryption_config, ) - future = api.create_backup(request=request, metadata=metadata,) + future = api.create_backup( + request=request, + metadata=metadata, + ) return future def exists(self): @@ -358,7 +364,10 @@ def update_expire_time(self, new_expire_time): """ api = self._instance._client.database_admin_api metadata = _metadata_with_prefix(self.name) - backup_update = BackupPB(name=self.name, expire_time=new_expire_time,) + backup_update = BackupPB( + name=self.name, + expire_time=new_expire_time, + ) update_mask = {"paths": ["expire_time"]} api.update_backup( backup=backup_update, update_mask=update_mask, metadata=metadata diff --git a/google/cloud/spanner_v1/batch.py b/google/cloud/spanner_v1/batch.py index 4d8364df1f..48c533d2cd 100644 --- a/google/cloud/spanner_v1/batch.py +++ b/google/cloud/spanner_v1/batch.py @@ -179,7 +179,10 @@ def commit(self, return_commit_stats=False, request_options=None): request_options=request_options, ) with trace_call("CloudSpanner.Commit", self._session, trace_attributes): - response = api.commit(request=request, metadata=metadata,) + response = api.commit( + request=request, + metadata=metadata, + ) self.committed = response.commit_timestamp self.commit_stats = response.commit_stats return self.committed diff --git a/google/cloud/spanner_v1/database.py b/google/cloud/spanner_v1/database.py index 7ccefc1228..5dc41e525e 100644 --- a/google/cloud/spanner_v1/database.py +++ b/google/cloud/spanner_v1/database.py @@ -441,7 +441,9 @@ def update_ddl(self, ddl_statements, operation_id=""): metadata = _metadata_with_prefix(self.name) request = UpdateDatabaseDdlRequest( - database=self.name, statements=ddl_statements, operation_id=operation_id, + database=self.name, + statements=ddl_statements, + operation_id=operation_id, ) future = api.update_database_ddl(request=request, metadata=metadata) @@ -544,7 +546,8 @@ def execute_pdml(): request_options=request_options, ) method = functools.partial( - api.execute_streaming_sql, metadata=metadata, + api.execute_streaming_sql, + metadata=metadata, ) iterator = _restart_on_unavailable(method, request) @@ -694,7 +697,10 @@ def restore(self, source): backup=source.name, encryption_config=self._encryption_config or None, ) - future = api.restore_database(request=request, metadata=metadata,) + future = api.restore_database( + request=request, + metadata=metadata, + ) return future def is_ready(self): @@ -1032,7 +1038,11 @@ def generate_read_batches( yield {"partition": partition, "read": read_info.copy()} def process_read_batch( - self, batch, *, retry=gapic_v1.method.DEFAULT, timeout=gapic_v1.method.DEFAULT, + self, + batch, + *, + retry=gapic_v1.method.DEFAULT, + timeout=gapic_v1.method.DEFAULT, ): """Process a single, partitioned read. @@ -1149,7 +1159,11 @@ def generate_query_batches( yield {"partition": partition, "query": query_info} def process_query_batch( - self, batch, *, retry=gapic_v1.method.DEFAULT, timeout=gapic_v1.method.DEFAULT, + self, + batch, + *, + retry=gapic_v1.method.DEFAULT, + timeout=gapic_v1.method.DEFAULT, ): """Process a single, partitioned query. diff --git a/google/cloud/spanner_v1/instance.py b/google/cloud/spanner_v1/instance.py index d3514bd85d..f8869d1f7b 100644 --- a/google/cloud/spanner_v1/instance.py +++ b/google/cloud/spanner_v1/instance.py @@ -554,7 +554,11 @@ def backup( ) def copy_backup( - self, backup_id, source_backup, expire_time=None, encryption_config=None, + self, + backup_id, + source_backup, + expire_time=None, + encryption_config=None, ): """Factory to create a copy backup within this instance. @@ -604,7 +608,9 @@ def list_backups(self, filter_="", page_size=None): """ metadata = _metadata_with_prefix(self.name) request = ListBackupsRequest( - parent=self.name, filter=filter_, page_size=page_size, + parent=self.name, + filter=filter_, + page_size=page_size, ) page_iter = self._client.database_admin_api.list_backups( request=request, metadata=metadata @@ -632,7 +638,9 @@ def list_backup_operations(self, filter_="", page_size=None): """ metadata = _metadata_with_prefix(self.name) request = ListBackupOperationsRequest( - parent=self.name, filter=filter_, page_size=page_size, + parent=self.name, + filter=filter_, + page_size=page_size, ) page_iter = self._client.database_admin_api.list_backup_operations( request=request, metadata=metadata @@ -660,7 +668,9 @@ def list_database_operations(self, filter_="", page_size=None): """ metadata = _metadata_with_prefix(self.name) request = ListDatabaseOperationsRequest( - parent=self.name, filter=filter_, page_size=page_size, + parent=self.name, + filter=filter_, + page_size=page_size, ) page_iter = self._client.database_admin_api.list_database_operations( request=request, metadata=metadata diff --git a/google/cloud/spanner_v1/services/spanner/async_client.py b/google/cloud/spanner_v1/services/spanner/async_client.py index 9fd1c6a75b..a9dc85cb22 100644 --- a/google/cloud/spanner_v1/services/spanner/async_client.py +++ b/google/cloud/spanner_v1/services/spanner/async_client.py @@ -326,7 +326,12 @@ def sample_create_session(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -445,7 +450,12 @@ def sample_batch_create_sessions(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -545,7 +555,12 @@ def sample_get_session(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -648,12 +663,20 @@ def sample_list_sessions(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # This method is paged; wrap the response in a pager, which provides # an `__aiter__` convenience method. response = pagers.ListSessionsAsyncPager( - method=rpc, request=request, response=response, metadata=metadata, + method=rpc, + request=request, + response=response, + metadata=metadata, ) # Done; return the response. @@ -748,7 +771,10 @@ def sample_delete_session(): # Send the request. await rpc( - request, retry=retry, timeout=timeout, metadata=metadata, + request, + retry=retry, + timeout=timeout, + metadata=metadata, ) async def execute_sql( @@ -839,7 +865,12 @@ def sample_execute_sql(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -919,7 +950,12 @@ def sample_execute_streaming_sql(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1052,7 +1088,12 @@ def sample_execute_batch_dml(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1147,7 +1188,12 @@ def sample_read(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1228,7 +1274,12 @@ def sample_streaming_read(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1340,7 +1391,12 @@ def sample_begin_transaction(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1498,7 +1554,12 @@ def sample_commit(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1610,7 +1671,10 @@ def sample_rollback(): # Send the request. await rpc( - request, retry=retry, timeout=timeout, metadata=metadata, + request, + retry=retry, + timeout=timeout, + metadata=metadata, ) async def partition_query( @@ -1701,7 +1765,12 @@ def sample_partition_query(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1797,7 +1866,12 @@ def sample_partition_read(): ) # Send the request. - response = await rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = await rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1811,7 +1885,9 @@ async def __aexit__(self, exc_type, exc, tb): try: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution("google-cloud-spanner",).version, + gapic_version=pkg_resources.get_distribution( + "google-cloud-spanner", + ).version, ) except pkg_resources.DistributionNotFound: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() diff --git a/google/cloud/spanner_v1/services/spanner/client.py b/google/cloud/spanner_v1/services/spanner/client.py index 31f274b0db..42fb0a9a9c 100644 --- a/google/cloud/spanner_v1/services/spanner/client.py +++ b/google/cloud/spanner_v1/services/spanner/client.py @@ -60,7 +60,10 @@ class SpannerClientMeta(type): _transport_registry["grpc"] = SpannerGrpcTransport _transport_registry["grpc_asyncio"] = SpannerGrpcAsyncIOTransport - def get_transport_class(cls, label: str = None,) -> Type[SpannerTransport]: + def get_transport_class( + cls, + label: str = None, + ) -> Type[SpannerTransport]: """Returns an appropriate transport class. Args: @@ -168,10 +171,16 @@ def transport(self) -> SpannerTransport: return self._transport @staticmethod - def database_path(project: str, instance: str, database: str,) -> str: + def database_path( + project: str, + instance: str, + database: str, + ) -> str: """Returns a fully-qualified database string.""" return "projects/{project}/instances/{instance}/databases/{database}".format( - project=project, instance=instance, database=database, + project=project, + instance=instance, + database=database, ) @staticmethod @@ -184,10 +193,18 @@ def parse_database_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def session_path(project: str, instance: str, database: str, session: str,) -> str: + def session_path( + project: str, + instance: str, + database: str, + session: str, + ) -> str: """Returns a fully-qualified session string.""" return "projects/{project}/instances/{instance}/databases/{database}/sessions/{session}".format( - project=project, instance=instance, database=database, session=session, + project=project, + instance=instance, + database=database, + session=session, ) @staticmethod @@ -200,7 +217,9 @@ def parse_session_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_billing_account_path(billing_account: str,) -> str: + def common_billing_account_path( + billing_account: str, + ) -> str: """Returns a fully-qualified billing_account string.""" return "billingAccounts/{billing_account}".format( billing_account=billing_account, @@ -213,9 +232,13 @@ def parse_common_billing_account_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_folder_path(folder: str,) -> str: + def common_folder_path( + folder: str, + ) -> str: """Returns a fully-qualified folder string.""" - return "folders/{folder}".format(folder=folder,) + return "folders/{folder}".format( + folder=folder, + ) @staticmethod def parse_common_folder_path(path: str) -> Dict[str, str]: @@ -224,9 +247,13 @@ def parse_common_folder_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_organization_path(organization: str,) -> str: + def common_organization_path( + organization: str, + ) -> str: """Returns a fully-qualified organization string.""" - return "organizations/{organization}".format(organization=organization,) + return "organizations/{organization}".format( + organization=organization, + ) @staticmethod def parse_common_organization_path(path: str) -> Dict[str, str]: @@ -235,9 +262,13 @@ def parse_common_organization_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_project_path(project: str,) -> str: + def common_project_path( + project: str, + ) -> str: """Returns a fully-qualified project string.""" - return "projects/{project}".format(project=project,) + return "projects/{project}".format( + project=project, + ) @staticmethod def parse_common_project_path(path: str) -> Dict[str, str]: @@ -246,10 +277,14 @@ def parse_common_project_path(path: str) -> Dict[str, str]: return m.groupdict() if m else {} @staticmethod - def common_location_path(project: str, location: str,) -> str: + def common_location_path( + project: str, + location: str, + ) -> str: """Returns a fully-qualified location string.""" return "projects/{project}/locations/{location}".format( - project=project, location=location, + project=project, + location=location, ) @staticmethod @@ -525,7 +560,12 @@ def sample_create_session(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -635,7 +675,12 @@ def sample_batch_create_sessions(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -726,7 +771,12 @@ def sample_get_session(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -820,12 +870,20 @@ def sample_list_sessions(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # This method is paged; wrap the response in a pager, which provides # an `__iter__` convenience method. response = pagers.ListSessionsPager( - method=rpc, request=request, response=response, metadata=metadata, + method=rpc, + request=request, + response=response, + metadata=metadata, ) # Done; return the response. @@ -911,7 +969,10 @@ def sample_delete_session(): # Send the request. rpc( - request, retry=retry, timeout=timeout, metadata=metadata, + request, + retry=retry, + timeout=timeout, + metadata=metadata, ) def execute_sql( @@ -994,7 +1055,12 @@ def sample_execute_sql(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1075,7 +1141,12 @@ def sample_execute_streaming_sql(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1200,7 +1271,12 @@ def sample_execute_batch_dml(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1287,7 +1363,12 @@ def sample_read(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1369,7 +1450,12 @@ def sample_streaming_read(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1472,7 +1558,12 @@ def sample_begin_transaction(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1621,7 +1712,12 @@ def sample_commit(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1724,7 +1820,10 @@ def sample_rollback(): # Send the request. rpc( - request, retry=retry, timeout=timeout, metadata=metadata, + request, + retry=retry, + timeout=timeout, + metadata=metadata, ) def partition_query( @@ -1807,7 +1906,12 @@ def sample_partition_query(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1895,7 +1999,12 @@ def sample_partition_read(): ) # Send the request. - response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) + response = rpc( + request, + retry=retry, + timeout=timeout, + metadata=metadata, + ) # Done; return the response. return response @@ -1916,7 +2025,9 @@ def __exit__(self, type, value, traceback): try: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution("google-cloud-spanner",).version, + gapic_version=pkg_resources.get_distribution( + "google-cloud-spanner", + ).version, ) except pkg_resources.DistributionNotFound: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() diff --git a/google/cloud/spanner_v1/services/spanner/transports/base.py b/google/cloud/spanner_v1/services/spanner/transports/base.py index 40ef03a812..0066447c79 100644 --- a/google/cloud/spanner_v1/services/spanner/transports/base.py +++ b/google/cloud/spanner_v1/services/spanner/transports/base.py @@ -33,7 +33,9 @@ try: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( - gapic_version=pkg_resources.get_distribution("google-cloud-spanner",).version, + gapic_version=pkg_resources.get_distribution( + "google-cloud-spanner", + ).version, ) except pkg_resources.DistributionNotFound: DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo() @@ -243,7 +245,9 @@ def _prep_wrapped_messages(self, client_info): client_info=client_info, ), self.streaming_read: gapic_v1.method.wrap_method( - self.streaming_read, default_timeout=3600.0, client_info=client_info, + self.streaming_read, + default_timeout=3600.0, + client_info=client_info, ), self.begin_transaction: gapic_v1.method.wrap_method( self.begin_transaction, @@ -320,9 +324,9 @@ def _prep_wrapped_messages(self, client_info): def close(self): """Closes resources associated with the transport. - .. warning:: - Only call this method if the transport is NOT shared - with other clients - this may cause errors in other clients! + .. warning:: + Only call this method if the transport is NOT shared + with other clients - this may cause errors in other clients! """ raise NotImplementedError() diff --git a/google/cloud/spanner_v1/services/spanner/transports/grpc.py b/google/cloud/spanner_v1/services/spanner/transports/grpc.py index d33a89b694..ba84345989 100644 --- a/google/cloud/spanner_v1/services/spanner/transports/grpc.py +++ b/google/cloud/spanner_v1/services/spanner/transports/grpc.py @@ -230,8 +230,7 @@ def create_channel( @property def grpc_channel(self) -> grpc.Channel: - """Return the channel designed to connect to this service. - """ + """Return the channel designed to connect to this service.""" return self._grpc_channel @property diff --git a/google/cloud/spanner_v1/session.py b/google/cloud/spanner_v1/session.py index 5eca0a8d2f..1ab6a93626 100644 --- a/google/cloud/spanner_v1/session.py +++ b/google/cloud/spanner_v1/session.py @@ -120,7 +120,10 @@ def create(self): request.session.labels = self._labels with trace_call("CloudSpanner.CreateSession", self, self._labels): - session_pb = api.create_session(request=request, metadata=metadata,) + session_pb = api.create_session( + request=request, + metadata=metadata, + ) self._session_id = session_pb.name.split("/")[-1] def exists(self): @@ -438,4 +441,4 @@ def _get_retry_delay(cause, attempts): nanos = retry_info.retry_delay.nanos return retry_info.retry_delay.seconds + nanos / 1.0e9 - return 2 ** attempts + random.random() + return 2**attempts + random.random() diff --git a/google/cloud/spanner_v1/snapshot.py b/google/cloud/spanner_v1/snapshot.py index aaf9caa2fc..75aed33e33 100644 --- a/google/cloud/spanner_v1/snapshot.py +++ b/google/cloud/spanner_v1/snapshot.py @@ -449,7 +449,10 @@ def partition_read( "CloudSpanner.PartitionReadOnlyTransaction", self._session, trace_attributes ): response = api.partition_read( - request=request, metadata=metadata, retry=retry, timeout=timeout, + request=request, + metadata=metadata, + retry=retry, + timeout=timeout, ) return [partition.partition_token for partition in response.partitions] @@ -541,7 +544,10 @@ def partition_query( trace_attributes, ): response = api.partition_query( - request=request, metadata=metadata, retry=retry, timeout=timeout, + request=request, + metadata=metadata, + retry=retry, + timeout=timeout, ) return [partition.partition_token for partition in response.partitions] diff --git a/google/cloud/spanner_v1/streamed.py b/google/cloud/spanner_v1/streamed.py index 3b7eb7c89a..80a452d558 100644 --- a/google/cloud/spanner_v1/streamed.py +++ b/google/cloud/spanner_v1/streamed.py @@ -205,7 +205,11 @@ class Unmergeable(ValueError): """ def __init__(self, lhs, rhs, type_): - message = "Cannot merge %s values: %s %s" % (TypeCode(type_.code), lhs, rhs,) + message = "Cannot merge %s values: %s %s" % ( + TypeCode(type_.code), + lhs, + rhs, + ) super(Unmergeable, self).__init__(message) diff --git a/google/cloud/spanner_v1/transaction.py b/google/cloud/spanner_v1/transaction.py index b960761147..d776b12469 100644 --- a/google/cloud/spanner_v1/transaction.py +++ b/google/cloud/spanner_v1/transaction.py @@ -166,7 +166,10 @@ def commit(self, return_commit_stats=False, request_options=None): request_options=request_options, ) with trace_call("CloudSpanner.Commit", self._session, trace_attributes): - response = api.commit(request=request, metadata=metadata,) + response = api.commit( + request=request, + metadata=metadata, + ) self.committed = response.commit_timestamp if return_commit_stats: self.commit_stats = response.commit_stats diff --git a/google/cloud/spanner_v1/types/commit_response.py b/google/cloud/spanner_v1/types/commit_response.py index 2d03f35ba5..837cbbf4f4 100644 --- a/google/cloud/spanner_v1/types/commit_response.py +++ b/google/cloud/spanner_v1/types/commit_response.py @@ -18,7 +18,12 @@ from google.protobuf import timestamp_pb2 # type: ignore -__protobuf__ = proto.module(package="google.spanner.v1", manifest={"CommitResponse",},) +__protobuf__ = proto.module( + package="google.spanner.v1", + manifest={ + "CommitResponse", + }, +) class CommitResponse(proto.Message): @@ -50,12 +55,21 @@ class CommitStats(proto.Message): `INVALID_ARGUMENT `__. """ - mutation_count = proto.Field(proto.INT64, number=1,) + mutation_count = proto.Field( + proto.INT64, + number=1, + ) commit_timestamp = proto.Field( - proto.MESSAGE, number=1, message=timestamp_pb2.Timestamp, + proto.MESSAGE, + number=1, + message=timestamp_pb2.Timestamp, + ) + commit_stats = proto.Field( + proto.MESSAGE, + number=2, + message=CommitStats, ) - commit_stats = proto.Field(proto.MESSAGE, number=2, message=CommitStats,) __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/google/cloud/spanner_v1/types/keys.py b/google/cloud/spanner_v1/types/keys.py index 6486b7ce6d..81e6e1360c 100644 --- a/google/cloud/spanner_v1/types/keys.py +++ b/google/cloud/spanner_v1/types/keys.py @@ -19,7 +19,11 @@ __protobuf__ = proto.module( - package="google.spanner.v1", manifest={"KeyRange", "KeySet",}, + package="google.spanner.v1", + manifest={ + "KeyRange", + "KeySet", + }, ) @@ -169,16 +173,28 @@ class KeyRange(proto.Message): """ start_closed = proto.Field( - proto.MESSAGE, number=1, oneof="start_key_type", message=struct_pb2.ListValue, + proto.MESSAGE, + number=1, + oneof="start_key_type", + message=struct_pb2.ListValue, ) start_open = proto.Field( - proto.MESSAGE, number=2, oneof="start_key_type", message=struct_pb2.ListValue, + proto.MESSAGE, + number=2, + oneof="start_key_type", + message=struct_pb2.ListValue, ) end_closed = proto.Field( - proto.MESSAGE, number=3, oneof="end_key_type", message=struct_pb2.ListValue, + proto.MESSAGE, + number=3, + oneof="end_key_type", + message=struct_pb2.ListValue, ) end_open = proto.Field( - proto.MESSAGE, number=4, oneof="end_key_type", message=struct_pb2.ListValue, + proto.MESSAGE, + number=4, + oneof="end_key_type", + message=struct_pb2.ListValue, ) @@ -209,9 +225,20 @@ class KeySet(proto.Message): only yielded once. """ - keys = proto.RepeatedField(proto.MESSAGE, number=1, message=struct_pb2.ListValue,) - ranges = proto.RepeatedField(proto.MESSAGE, number=2, message="KeyRange",) - all_ = proto.Field(proto.BOOL, number=3,) + keys = proto.RepeatedField( + proto.MESSAGE, + number=1, + message=struct_pb2.ListValue, + ) + ranges = proto.RepeatedField( + proto.MESSAGE, + number=2, + message="KeyRange", + ) + all_ = proto.Field( + proto.BOOL, + number=3, + ) __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/google/cloud/spanner_v1/types/mutation.py b/google/cloud/spanner_v1/types/mutation.py index 700efb15cc..2ad2db30ac 100644 --- a/google/cloud/spanner_v1/types/mutation.py +++ b/google/cloud/spanner_v1/types/mutation.py @@ -19,7 +19,12 @@ from google.protobuf import struct_pb2 # type: ignore -__protobuf__ = proto.module(package="google.spanner.v1", manifest={"Mutation",},) +__protobuf__ = proto.module( + package="google.spanner.v1", + manifest={ + "Mutation", + }, +) class Mutation(proto.Message): @@ -116,10 +121,18 @@ class Write(proto.Message): [here][google.spanner.v1.TypeCode]. """ - table = proto.Field(proto.STRING, number=1,) - columns = proto.RepeatedField(proto.STRING, number=2,) + table = proto.Field( + proto.STRING, + number=1, + ) + columns = proto.RepeatedField( + proto.STRING, + number=2, + ) values = proto.RepeatedField( - proto.MESSAGE, number=3, message=struct_pb2.ListValue, + proto.MESSAGE, + number=3, + message=struct_pb2.ListValue, ) class Delete(proto.Message): @@ -139,16 +152,46 @@ class Delete(proto.Message): succeed even if some or all rows do not exist. """ - table = proto.Field(proto.STRING, number=1,) - key_set = proto.Field(proto.MESSAGE, number=2, message=keys.KeySet,) + table = proto.Field( + proto.STRING, + number=1, + ) + key_set = proto.Field( + proto.MESSAGE, + number=2, + message=keys.KeySet, + ) - insert = proto.Field(proto.MESSAGE, number=1, oneof="operation", message=Write,) - update = proto.Field(proto.MESSAGE, number=2, oneof="operation", message=Write,) + insert = proto.Field( + proto.MESSAGE, + number=1, + oneof="operation", + message=Write, + ) + update = proto.Field( + proto.MESSAGE, + number=2, + oneof="operation", + message=Write, + ) insert_or_update = proto.Field( - proto.MESSAGE, number=3, oneof="operation", message=Write, + proto.MESSAGE, + number=3, + oneof="operation", + message=Write, + ) + replace = proto.Field( + proto.MESSAGE, + number=4, + oneof="operation", + message=Write, + ) + delete = proto.Field( + proto.MESSAGE, + number=5, + oneof="operation", + message=Delete, ) - replace = proto.Field(proto.MESSAGE, number=4, oneof="operation", message=Write,) - delete = proto.Field(proto.MESSAGE, number=5, oneof="operation", message=Delete,) __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/google/cloud/spanner_v1/types/query_plan.py b/google/cloud/spanner_v1/types/query_plan.py index c003aaadd0..76467cf6ab 100644 --- a/google/cloud/spanner_v1/types/query_plan.py +++ b/google/cloud/spanner_v1/types/query_plan.py @@ -19,7 +19,11 @@ __protobuf__ = proto.module( - package="google.spanner.v1", manifest={"PlanNode", "QueryPlan",}, + package="google.spanner.v1", + manifest={ + "PlanNode", + "QueryPlan", + }, ) @@ -101,9 +105,18 @@ class ChildLink(proto.Message): to the variable names assigned to the columns. """ - child_index = proto.Field(proto.INT32, number=1,) - type_ = proto.Field(proto.STRING, number=2,) - variable = proto.Field(proto.STRING, number=3,) + child_index = proto.Field( + proto.INT32, + number=1, + ) + type_ = proto.Field( + proto.STRING, + number=2, + ) + variable = proto.Field( + proto.STRING, + number=3, + ) class ShortRepresentation(proto.Message): r"""Condensed representation of a node and its subtree. Only present for @@ -121,18 +134,49 @@ class ShortRepresentation(proto.Message): subquery may not necessarily be a direct child of this node. """ - description = proto.Field(proto.STRING, number=1,) - subqueries = proto.MapField(proto.STRING, proto.INT32, number=2,) - - index = proto.Field(proto.INT32, number=1,) - kind = proto.Field(proto.ENUM, number=2, enum=Kind,) - display_name = proto.Field(proto.STRING, number=3,) - child_links = proto.RepeatedField(proto.MESSAGE, number=4, message=ChildLink,) + description = proto.Field( + proto.STRING, + number=1, + ) + subqueries = proto.MapField( + proto.STRING, + proto.INT32, + number=2, + ) + + index = proto.Field( + proto.INT32, + number=1, + ) + kind = proto.Field( + proto.ENUM, + number=2, + enum=Kind, + ) + display_name = proto.Field( + proto.STRING, + number=3, + ) + child_links = proto.RepeatedField( + proto.MESSAGE, + number=4, + message=ChildLink, + ) short_representation = proto.Field( - proto.MESSAGE, number=5, message=ShortRepresentation, + proto.MESSAGE, + number=5, + message=ShortRepresentation, + ) + metadata = proto.Field( + proto.MESSAGE, + number=6, + message=struct_pb2.Struct, + ) + execution_stats = proto.Field( + proto.MESSAGE, + number=7, + message=struct_pb2.Struct, ) - metadata = proto.Field(proto.MESSAGE, number=6, message=struct_pb2.Struct,) - execution_stats = proto.Field(proto.MESSAGE, number=7, message=struct_pb2.Struct,) class QueryPlan(proto.Message): @@ -147,7 +191,11 @@ class QueryPlan(proto.Message): to its index in ``plan_nodes``. """ - plan_nodes = proto.RepeatedField(proto.MESSAGE, number=1, message="PlanNode",) + plan_nodes = proto.RepeatedField( + proto.MESSAGE, + number=1, + message="PlanNode", + ) __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/google/cloud/spanner_v1/types/result_set.py b/google/cloud/spanner_v1/types/result_set.py index 30862d1bd0..68ff3700c5 100644 --- a/google/cloud/spanner_v1/types/result_set.py +++ b/google/cloud/spanner_v1/types/result_set.py @@ -23,7 +23,12 @@ __protobuf__ = proto.module( package="google.spanner.v1", - manifest={"ResultSet", "PartialResultSet", "ResultSetMetadata", "ResultSetStats",}, + manifest={ + "ResultSet", + "PartialResultSet", + "ResultSetMetadata", + "ResultSetStats", + }, ) @@ -55,9 +60,21 @@ class ResultSet(proto.Message): [ExecuteSqlRequest.query_mode][google.spanner.v1.ExecuteSqlRequest.query_mode]. """ - metadata = proto.Field(proto.MESSAGE, number=1, message="ResultSetMetadata",) - rows = proto.RepeatedField(proto.MESSAGE, number=2, message=struct_pb2.ListValue,) - stats = proto.Field(proto.MESSAGE, number=3, message="ResultSetStats",) + metadata = proto.Field( + proto.MESSAGE, + number=1, + message="ResultSetMetadata", + ) + rows = proto.RepeatedField( + proto.MESSAGE, + number=2, + message=struct_pb2.ListValue, + ) + stats = proto.Field( + proto.MESSAGE, + number=3, + message="ResultSetStats", + ) class PartialResultSet(proto.Message): @@ -175,11 +192,29 @@ class PartialResultSet(proto.Message): statements. """ - metadata = proto.Field(proto.MESSAGE, number=1, message="ResultSetMetadata",) - values = proto.RepeatedField(proto.MESSAGE, number=2, message=struct_pb2.Value,) - chunked_value = proto.Field(proto.BOOL, number=3,) - resume_token = proto.Field(proto.BYTES, number=4,) - stats = proto.Field(proto.MESSAGE, number=5, message="ResultSetStats",) + metadata = proto.Field( + proto.MESSAGE, + number=1, + message="ResultSetMetadata", + ) + values = proto.RepeatedField( + proto.MESSAGE, + number=2, + message=struct_pb2.Value, + ) + chunked_value = proto.Field( + proto.BOOL, + number=3, + ) + resume_token = proto.Field( + proto.BYTES, + number=4, + ) + stats = proto.Field( + proto.MESSAGE, + number=5, + message="ResultSetStats", + ) class ResultSetMetadata(proto.Message): @@ -205,9 +240,15 @@ class ResultSetMetadata(proto.Message): transaction is yielded here. """ - row_type = proto.Field(proto.MESSAGE, number=1, message=gs_type.StructType,) + row_type = proto.Field( + proto.MESSAGE, + number=1, + message=gs_type.StructType, + ) transaction = proto.Field( - proto.MESSAGE, number=2, message=gs_transaction.Transaction, + proto.MESSAGE, + number=2, + message=gs_transaction.Transaction, ) @@ -252,10 +293,26 @@ class ResultSetStats(proto.Message): This field is a member of `oneof`_ ``row_count``. """ - query_plan = proto.Field(proto.MESSAGE, number=1, message=gs_query_plan.QueryPlan,) - query_stats = proto.Field(proto.MESSAGE, number=2, message=struct_pb2.Struct,) - row_count_exact = proto.Field(proto.INT64, number=3, oneof="row_count",) - row_count_lower_bound = proto.Field(proto.INT64, number=4, oneof="row_count",) + query_plan = proto.Field( + proto.MESSAGE, + number=1, + message=gs_query_plan.QueryPlan, + ) + query_stats = proto.Field( + proto.MESSAGE, + number=2, + message=struct_pb2.Struct, + ) + row_count_exact = proto.Field( + proto.INT64, + number=3, + oneof="row_count", + ) + row_count_lower_bound = proto.Field( + proto.INT64, + number=4, + oneof="row_count", + ) __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/google/cloud/spanner_v1/types/spanner.py b/google/cloud/spanner_v1/types/spanner.py index cea8be56a9..2a94ded3fe 100644 --- a/google/cloud/spanner_v1/types/spanner.py +++ b/google/cloud/spanner_v1/types/spanner.py @@ -65,8 +65,15 @@ class CreateSessionRequest(proto.Message): Required. The session to create. """ - database = proto.Field(proto.STRING, number=1,) - session = proto.Field(proto.MESSAGE, number=2, message="Session",) + database = proto.Field( + proto.STRING, + number=1, + ) + session = proto.Field( + proto.MESSAGE, + number=2, + message="Session", + ) class BatchCreateSessionsRequest(proto.Message): @@ -90,9 +97,19 @@ class BatchCreateSessionsRequest(proto.Message): as necessary). """ - database = proto.Field(proto.STRING, number=1,) - session_template = proto.Field(proto.MESSAGE, number=2, message="Session",) - session_count = proto.Field(proto.INT32, number=3,) + database = proto.Field( + proto.STRING, + number=1, + ) + session_template = proto.Field( + proto.MESSAGE, + number=2, + message="Session", + ) + session_count = proto.Field( + proto.INT32, + number=3, + ) class BatchCreateSessionsResponse(proto.Message): @@ -104,7 +121,11 @@ class BatchCreateSessionsResponse(proto.Message): The freshly created sessions. """ - session = proto.RepeatedField(proto.MESSAGE, number=1, message="Session",) + session = proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Session", + ) class Session(proto.Message): @@ -137,11 +158,24 @@ class Session(proto.Message): earlier than the actual last use time. """ - name = proto.Field(proto.STRING, number=1,) - labels = proto.MapField(proto.STRING, proto.STRING, number=2,) - create_time = proto.Field(proto.MESSAGE, number=3, message=timestamp_pb2.Timestamp,) + name = proto.Field( + proto.STRING, + number=1, + ) + labels = proto.MapField( + proto.STRING, + proto.STRING, + number=2, + ) + create_time = proto.Field( + proto.MESSAGE, + number=3, + message=timestamp_pb2.Timestamp, + ) approximate_last_use_time = proto.Field( - proto.MESSAGE, number=4, message=timestamp_pb2.Timestamp, + proto.MESSAGE, + number=4, + message=timestamp_pb2.Timestamp, ) @@ -154,7 +188,10 @@ class GetSessionRequest(proto.Message): retrieve. """ - name = proto.Field(proto.STRING, number=1,) + name = proto.Field( + proto.STRING, + number=1, + ) class ListSessionsRequest(proto.Message): @@ -188,10 +225,22 @@ class ListSessionsRequest(proto.Message): and the value of the label contains the string "dev". """ - database = proto.Field(proto.STRING, number=1,) - page_size = proto.Field(proto.INT32, number=2,) - page_token = proto.Field(proto.STRING, number=3,) - filter = proto.Field(proto.STRING, number=4,) + database = proto.Field( + proto.STRING, + number=1, + ) + page_size = proto.Field( + proto.INT32, + number=2, + ) + page_token = proto.Field( + proto.STRING, + number=3, + ) + filter = proto.Field( + proto.STRING, + number=4, + ) class ListSessionsResponse(proto.Message): @@ -211,8 +260,15 @@ class ListSessionsResponse(proto.Message): def raw_page(self): return self - sessions = proto.RepeatedField(proto.MESSAGE, number=1, message="Session",) - next_page_token = proto.Field(proto.STRING, number=2,) + sessions = proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Session", + ) + next_page_token = proto.Field( + proto.STRING, + number=2, + ) class DeleteSessionRequest(proto.Message): @@ -224,7 +280,10 @@ class DeleteSessionRequest(proto.Message): Required. The name of the session to delete. """ - name = proto.Field(proto.STRING, number=1,) + name = proto.Field( + proto.STRING, + number=1, + ) class RequestOptions(proto.Message): @@ -282,9 +341,19 @@ class Priority(proto.Enum): PRIORITY_MEDIUM = 2 PRIORITY_HIGH = 3 - priority = proto.Field(proto.ENUM, number=1, enum=Priority,) - request_tag = proto.Field(proto.STRING, number=2,) - transaction_tag = proto.Field(proto.STRING, number=3,) + priority = proto.Field( + proto.ENUM, + number=1, + enum=Priority, + ) + request_tag = proto.Field( + proto.STRING, + number=2, + ) + transaction_tag = proto.Field( + proto.STRING, + number=3, + ) class ExecuteSqlRequest(proto.Message): @@ -450,24 +519,66 @@ class QueryOptions(proto.Message): garbage collection fails with an ``INVALID_ARGUMENT`` error. """ - optimizer_version = proto.Field(proto.STRING, number=1,) - optimizer_statistics_package = proto.Field(proto.STRING, number=2,) + optimizer_version = proto.Field( + proto.STRING, + number=1, + ) + optimizer_statistics_package = proto.Field( + proto.STRING, + number=2, + ) - session = proto.Field(proto.STRING, number=1,) + session = proto.Field( + proto.STRING, + number=1, + ) transaction = proto.Field( - proto.MESSAGE, number=2, message=gs_transaction.TransactionSelector, + proto.MESSAGE, + number=2, + message=gs_transaction.TransactionSelector, + ) + sql = proto.Field( + proto.STRING, + number=3, + ) + params = proto.Field( + proto.MESSAGE, + number=4, + message=struct_pb2.Struct, ) - sql = proto.Field(proto.STRING, number=3,) - params = proto.Field(proto.MESSAGE, number=4, message=struct_pb2.Struct,) param_types = proto.MapField( - proto.STRING, proto.MESSAGE, number=5, message=gs_type.Type, + proto.STRING, + proto.MESSAGE, + number=5, + message=gs_type.Type, + ) + resume_token = proto.Field( + proto.BYTES, + number=6, + ) + query_mode = proto.Field( + proto.ENUM, + number=7, + enum=QueryMode, + ) + partition_token = proto.Field( + proto.BYTES, + number=8, + ) + seqno = proto.Field( + proto.INT64, + number=9, + ) + query_options = proto.Field( + proto.MESSAGE, + number=10, + message=QueryOptions, + ) + request_options = proto.Field( + proto.MESSAGE, + number=11, + message="RequestOptions", ) - resume_token = proto.Field(proto.BYTES, number=6,) - query_mode = proto.Field(proto.ENUM, number=7, enum=QueryMode,) - partition_token = proto.Field(proto.BYTES, number=8,) - seqno = proto.Field(proto.INT64, number=9,) - query_options = proto.Field(proto.MESSAGE, number=10, message=QueryOptions,) - request_options = proto.Field(proto.MESSAGE, number=11, message="RequestOptions",) class ExecuteBatchDmlRequest(proto.Message): @@ -548,19 +659,45 @@ class Statement(proto.Message): SQL types. """ - sql = proto.Field(proto.STRING, number=1,) - params = proto.Field(proto.MESSAGE, number=2, message=struct_pb2.Struct,) + sql = proto.Field( + proto.STRING, + number=1, + ) + params = proto.Field( + proto.MESSAGE, + number=2, + message=struct_pb2.Struct, + ) param_types = proto.MapField( - proto.STRING, proto.MESSAGE, number=3, message=gs_type.Type, + proto.STRING, + proto.MESSAGE, + number=3, + message=gs_type.Type, ) - session = proto.Field(proto.STRING, number=1,) + session = proto.Field( + proto.STRING, + number=1, + ) transaction = proto.Field( - proto.MESSAGE, number=2, message=gs_transaction.TransactionSelector, + proto.MESSAGE, + number=2, + message=gs_transaction.TransactionSelector, + ) + statements = proto.RepeatedField( + proto.MESSAGE, + number=3, + message=Statement, + ) + seqno = proto.Field( + proto.INT64, + number=4, + ) + request_options = proto.Field( + proto.MESSAGE, + number=5, + message="RequestOptions", ) - statements = proto.RepeatedField(proto.MESSAGE, number=3, message=Statement,) - seqno = proto.Field(proto.INT64, number=4,) - request_options = proto.Field(proto.MESSAGE, number=5, message="RequestOptions",) class ExecuteBatchDmlResponse(proto.Message): @@ -619,9 +756,15 @@ class ExecuteBatchDmlResponse(proto.Message): """ result_sets = proto.RepeatedField( - proto.MESSAGE, number=1, message=result_set.ResultSet, + proto.MESSAGE, + number=1, + message=result_set.ResultSet, + ) + status = proto.Field( + proto.MESSAGE, + number=2, + message=status_pb2.Status, ) - status = proto.Field(proto.MESSAGE, number=2, message=status_pb2.Status,) class PartitionOptions(proto.Message): @@ -649,8 +792,14 @@ class PartitionOptions(proto.Message): this maximum count request. """ - partition_size_bytes = proto.Field(proto.INT64, number=1,) - max_partitions = proto.Field(proto.INT64, number=2,) + partition_size_bytes = proto.Field( + proto.INT64, + number=1, + ) + max_partitions = proto.Field( + proto.INT64, + number=2, + ) class PartitionQueryRequest(proto.Message): @@ -712,17 +861,34 @@ class PartitionQueryRequest(proto.Message): partitions are created. """ - session = proto.Field(proto.STRING, number=1,) + session = proto.Field( + proto.STRING, + number=1, + ) transaction = proto.Field( - proto.MESSAGE, number=2, message=gs_transaction.TransactionSelector, + proto.MESSAGE, + number=2, + message=gs_transaction.TransactionSelector, + ) + sql = proto.Field( + proto.STRING, + number=3, + ) + params = proto.Field( + proto.MESSAGE, + number=4, + message=struct_pb2.Struct, ) - sql = proto.Field(proto.STRING, number=3,) - params = proto.Field(proto.MESSAGE, number=4, message=struct_pb2.Struct,) param_types = proto.MapField( - proto.STRING, proto.MESSAGE, number=5, message=gs_type.Type, + proto.STRING, + proto.MESSAGE, + number=5, + message=gs_type.Type, ) partition_options = proto.Field( - proto.MESSAGE, number=6, message="PartitionOptions", + proto.MESSAGE, + number=6, + message="PartitionOptions", ) @@ -775,16 +941,36 @@ class PartitionReadRequest(proto.Message): partitions are created. """ - session = proto.Field(proto.STRING, number=1,) + session = proto.Field( + proto.STRING, + number=1, + ) transaction = proto.Field( - proto.MESSAGE, number=2, message=gs_transaction.TransactionSelector, + proto.MESSAGE, + number=2, + message=gs_transaction.TransactionSelector, + ) + table = proto.Field( + proto.STRING, + number=3, + ) + index = proto.Field( + proto.STRING, + number=4, + ) + columns = proto.RepeatedField( + proto.STRING, + number=5, + ) + key_set = proto.Field( + proto.MESSAGE, + number=6, + message=keys.KeySet, ) - table = proto.Field(proto.STRING, number=3,) - index = proto.Field(proto.STRING, number=4,) - columns = proto.RepeatedField(proto.STRING, number=5,) - key_set = proto.Field(proto.MESSAGE, number=6, message=keys.KeySet,) partition_options = proto.Field( - proto.MESSAGE, number=9, message="PartitionOptions", + proto.MESSAGE, + number=9, + message="PartitionOptions", ) @@ -801,7 +987,10 @@ class Partition(proto.Message): token. """ - partition_token = proto.Field(proto.BYTES, number=1,) + partition_token = proto.Field( + proto.BYTES, + number=1, + ) class PartitionResponse(proto.Message): @@ -816,9 +1005,15 @@ class PartitionResponse(proto.Message): Transaction created by this request. """ - partitions = proto.RepeatedField(proto.MESSAGE, number=1, message="Partition",) + partitions = proto.RepeatedField( + proto.MESSAGE, + number=1, + message="Partition", + ) transaction = proto.Field( - proto.MESSAGE, number=2, message=gs_transaction.Transaction, + proto.MESSAGE, + number=2, + message=gs_transaction.Transaction, ) @@ -896,18 +1091,49 @@ class ReadRequest(proto.Message): Common options for this request. """ - session = proto.Field(proto.STRING, number=1,) + session = proto.Field( + proto.STRING, + number=1, + ) transaction = proto.Field( - proto.MESSAGE, number=2, message=gs_transaction.TransactionSelector, + proto.MESSAGE, + number=2, + message=gs_transaction.TransactionSelector, + ) + table = proto.Field( + proto.STRING, + number=3, + ) + index = proto.Field( + proto.STRING, + number=4, + ) + columns = proto.RepeatedField( + proto.STRING, + number=5, + ) + key_set = proto.Field( + proto.MESSAGE, + number=6, + message=keys.KeySet, + ) + limit = proto.Field( + proto.INT64, + number=8, + ) + resume_token = proto.Field( + proto.BYTES, + number=9, + ) + partition_token = proto.Field( + proto.BYTES, + number=10, + ) + request_options = proto.Field( + proto.MESSAGE, + number=11, + message="RequestOptions", ) - table = proto.Field(proto.STRING, number=3,) - index = proto.Field(proto.STRING, number=4,) - columns = proto.RepeatedField(proto.STRING, number=5,) - key_set = proto.Field(proto.MESSAGE, number=6, message=keys.KeySet,) - limit = proto.Field(proto.INT64, number=8,) - resume_token = proto.Field(proto.BYTES, number=9,) - partition_token = proto.Field(proto.BYTES, number=10,) - request_options = proto.Field(proto.MESSAGE, number=11, message="RequestOptions",) class BeginTransactionRequest(proto.Message): @@ -928,11 +1154,20 @@ class BeginTransactionRequest(proto.Message): this transaction instead. """ - session = proto.Field(proto.STRING, number=1,) + session = proto.Field( + proto.STRING, + number=1, + ) options = proto.Field( - proto.MESSAGE, number=2, message=gs_transaction.TransactionOptions, + proto.MESSAGE, + number=2, + message=gs_transaction.TransactionOptions, + ) + request_options = proto.Field( + proto.MESSAGE, + number=3, + message="RequestOptions", ) - request_options = proto.Field(proto.MESSAGE, number=3, message="RequestOptions",) class CommitRequest(proto.Message): @@ -979,17 +1214,35 @@ class CommitRequest(proto.Message): Common options for this request. """ - session = proto.Field(proto.STRING, number=1,) - transaction_id = proto.Field(proto.BYTES, number=2, oneof="transaction",) + session = proto.Field( + proto.STRING, + number=1, + ) + transaction_id = proto.Field( + proto.BYTES, + number=2, + oneof="transaction", + ) single_use_transaction = proto.Field( proto.MESSAGE, number=3, oneof="transaction", message=gs_transaction.TransactionOptions, ) - mutations = proto.RepeatedField(proto.MESSAGE, number=4, message=mutation.Mutation,) - return_commit_stats = proto.Field(proto.BOOL, number=5,) - request_options = proto.Field(proto.MESSAGE, number=6, message="RequestOptions",) + mutations = proto.RepeatedField( + proto.MESSAGE, + number=4, + message=mutation.Mutation, + ) + return_commit_stats = proto.Field( + proto.BOOL, + number=5, + ) + request_options = proto.Field( + proto.MESSAGE, + number=6, + message="RequestOptions", + ) class RollbackRequest(proto.Message): @@ -1003,8 +1256,14 @@ class RollbackRequest(proto.Message): Required. The transaction to roll back. """ - session = proto.Field(proto.STRING, number=1,) - transaction_id = proto.Field(proto.BYTES, number=2,) + session = proto.Field( + proto.STRING, + number=1, + ) + transaction_id = proto.Field( + proto.BYTES, + number=2, + ) __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/google/cloud/spanner_v1/types/transaction.py b/google/cloud/spanner_v1/types/transaction.py index d8b9c31bc4..7c0a766c58 100644 --- a/google/cloud/spanner_v1/types/transaction.py +++ b/google/cloud/spanner_v1/types/transaction.py @@ -21,7 +21,11 @@ __protobuf__ = proto.module( package="google.spanner.v1", - manifest={"TransactionOptions", "Transaction", "TransactionSelector",}, + manifest={ + "TransactionOptions", + "Transaction", + "TransactionSelector", + }, ) @@ -340,8 +344,7 @@ class ReadWrite(proto.Message): """ class PartitionedDml(proto.Message): - r"""Message type to initiate a Partitioned DML transaction. - """ + r"""Message type to initiate a Partitioned DML transaction.""" class ReadOnly(proto.Message): r"""Message type to initiate a read-only transaction. @@ -427,7 +430,11 @@ class ReadOnly(proto.Message): message that describes the transaction. """ - strong = proto.Field(proto.BOOL, number=1, oneof="timestamp_bound",) + strong = proto.Field( + proto.BOOL, + number=1, + oneof="timestamp_bound", + ) min_read_timestamp = proto.Field( proto.MESSAGE, number=2, @@ -452,13 +459,29 @@ class ReadOnly(proto.Message): oneof="timestamp_bound", message=duration_pb2.Duration, ) - return_read_timestamp = proto.Field(proto.BOOL, number=6,) + return_read_timestamp = proto.Field( + proto.BOOL, + number=6, + ) - read_write = proto.Field(proto.MESSAGE, number=1, oneof="mode", message=ReadWrite,) + read_write = proto.Field( + proto.MESSAGE, + number=1, + oneof="mode", + message=ReadWrite, + ) partitioned_dml = proto.Field( - proto.MESSAGE, number=3, oneof="mode", message=PartitionedDml, + proto.MESSAGE, + number=3, + oneof="mode", + message=PartitionedDml, + ) + read_only = proto.Field( + proto.MESSAGE, + number=2, + oneof="mode", + message=ReadOnly, ) - read_only = proto.Field(proto.MESSAGE, number=2, oneof="mode", message=ReadOnly,) class Transaction(proto.Message): @@ -483,9 +506,14 @@ class Transaction(proto.Message): nanoseconds. Example: ``"2014-10-02T15:01:23.045123456Z"``. """ - id = proto.Field(proto.BYTES, number=1,) + id = proto.Field( + proto.BYTES, + number=1, + ) read_timestamp = proto.Field( - proto.MESSAGE, number=2, message=timestamp_pb2.Timestamp, + proto.MESSAGE, + number=2, + message=timestamp_pb2.Timestamp, ) @@ -528,11 +556,21 @@ class TransactionSelector(proto.Message): """ single_use = proto.Field( - proto.MESSAGE, number=1, oneof="selector", message="TransactionOptions", + proto.MESSAGE, + number=1, + oneof="selector", + message="TransactionOptions", + ) + id = proto.Field( + proto.BYTES, + number=2, + oneof="selector", ) - id = proto.Field(proto.BYTES, number=2, oneof="selector",) begin = proto.Field( - proto.MESSAGE, number=3, oneof="selector", message="TransactionOptions", + proto.MESSAGE, + number=3, + oneof="selector", + message="TransactionOptions", ) diff --git a/google/cloud/spanner_v1/types/type.py b/google/cloud/spanner_v1/types/type.py index 0bba5fe7e6..12b06fc737 100644 --- a/google/cloud/spanner_v1/types/type.py +++ b/google/cloud/spanner_v1/types/type.py @@ -18,7 +18,12 @@ __protobuf__ = proto.module( package="google.spanner.v1", - manifest={"TypeCode", "TypeAnnotationCode", "Type", "StructType",}, + manifest={ + "TypeCode", + "TypeAnnotationCode", + "Type", + "StructType", + }, ) @@ -88,10 +93,26 @@ class Type(proto.Message): on the read path. """ - code = proto.Field(proto.ENUM, number=1, enum="TypeCode",) - array_element_type = proto.Field(proto.MESSAGE, number=2, message="Type",) - struct_type = proto.Field(proto.MESSAGE, number=3, message="StructType",) - type_annotation = proto.Field(proto.ENUM, number=4, enum="TypeAnnotationCode",) + code = proto.Field( + proto.ENUM, + number=1, + enum="TypeCode", + ) + array_element_type = proto.Field( + proto.MESSAGE, + number=2, + message="Type", + ) + struct_type = proto.Field( + proto.MESSAGE, + number=3, + message="StructType", + ) + type_annotation = proto.Field( + proto.ENUM, + number=4, + enum="TypeAnnotationCode", + ) class StructType(proto.Message): @@ -126,10 +147,21 @@ class Field(proto.Message): The type of the field. """ - name = proto.Field(proto.STRING, number=1,) - type_ = proto.Field(proto.MESSAGE, number=2, message="Type",) - - fields = proto.RepeatedField(proto.MESSAGE, number=1, message=Field,) + name = proto.Field( + proto.STRING, + number=1, + ) + type_ = proto.Field( + proto.MESSAGE, + number=2, + message="Type", + ) + + fields = proto.RepeatedField( + proto.MESSAGE, + number=1, + message=Field, + ) __all__ = tuple(sorted(__protobuf__.manifest)) diff --git a/noxfile.py b/noxfile.py index 7759904126..b00d81b102 100644 --- a/noxfile.py +++ b/noxfile.py @@ -24,7 +24,7 @@ import nox -BLACK_VERSION = "black==19.10b0" +BLACK_VERSION = "black==22.3.0" BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] DEFAULT_PYTHON_VERSION = "3.8" @@ -57,7 +57,9 @@ def lint(session): """ session.install("flake8", BLACK_VERSION) session.run( - "black", "--check", *BLACK_PATHS, + "black", + "--check", + *BLACK_PATHS, ) session.run("flake8", "google", "tests") @@ -67,7 +69,8 @@ def blacken(session): """Run black. Format code to uniform standard.""" session.install(BLACK_VERSION) session.run( - "black", *BLACK_PATHS, + "black", + *BLACK_PATHS, ) diff --git a/samples/samples/noxfile.py b/samples/samples/noxfile.py index 85f5836dba..949e0fde9a 100644 --- a/samples/samples/noxfile.py +++ b/samples/samples/noxfile.py @@ -29,7 +29,7 @@ # WARNING - WARNING - WARNING - WARNING - WARNING # WARNING - WARNING - WARNING - WARNING - WARNING -BLACK_VERSION = "black==19.10b0" +BLACK_VERSION = "black==22.3.0" # Copy `noxfile_config.py` to your directory and modify it instead. @@ -208,7 +208,9 @@ def _session_tests( if os.path.exists("requirements-test.txt"): if os.path.exists("constraints-test.txt"): - session.install("-r", "requirements-test.txt", "-c", "constraints-test.txt") + session.install( + "-r", "requirements-test.txt", "-c", "constraints-test.txt" + ) else: session.install("-r", "requirements-test.txt") with open("requirements-test.txt") as rtfile: @@ -221,9 +223,9 @@ def _session_tests( post_install(session) if "pytest-parallel" in packages: - concurrent_args.extend(["--workers", "auto", "--tests-per-worker", "auto"]) + concurrent_args.extend(['--workers', 'auto', '--tests-per-worker', 'auto']) elif "pytest-xdist" in packages: - concurrent_args.extend(["-n", "auto"]) + concurrent_args.extend(['-n', 'auto']) session.run( "pytest", diff --git a/tests/system/_sample_data.py b/tests/system/_sample_data.py index 65f6e23ad3..a7f3b80a86 100644 --- a/tests/system/_sample_data.py +++ b/tests/system/_sample_data.py @@ -23,9 +23,9 @@ TABLE = "contacts" COLUMNS = ("contact_id", "first_name", "last_name", "email") ROW_DATA = ( - (1, u"Phred", u"Phlyntstone", u"phred@example.com"), - (2, u"Bharney", u"Rhubble", u"bharney@example.com"), - (3, u"Wylma", u"Phlyntstone", u"wylma@example.com"), + (1, "Phred", "Phlyntstone", "phred@example.com"), + (2, "Bharney", "Rhubble", "bharney@example.com"), + (3, "Wylma", "Phlyntstone", "wylma@example.com"), ) ALL = spanner_v1.KeySet(all_=True) SQL = "SELECT * FROM contacts ORDER BY contact_id" diff --git a/tests/system/conftest.py b/tests/system/conftest.py index 40b76208e8..0568b3bf3f 100644 --- a/tests/system/conftest.py +++ b/tests/system/conftest.py @@ -55,7 +55,8 @@ def spanner_client(): credentials = AnonymousCredentials() return spanner_v1.Client( - project=_helpers.EMULATOR_PROJECT, credentials=credentials, + project=_helpers.EMULATOR_PROJECT, + credentials=credentials, ) else: return spanner_v1.Client() # use google.auth.default credentials diff --git a/tests/system/test_backup_api.py b/tests/system/test_backup_api.py index f7325dc356..c09c06a5f2 100644 --- a/tests/system/test_backup_api.py +++ b/tests/system/test_backup_api.py @@ -60,7 +60,10 @@ def diff_config(shared_instance, instance_configs): @pytest.fixture(scope="session") def diff_config_instance( - spanner_client, shared_instance, instance_operation_timeout, diff_config, + spanner_client, + shared_instance, + instance_operation_timeout, + diff_config, ): if diff_config is None: return None @@ -180,7 +183,8 @@ def test_backup_workflow( encryption_type=RestoreDatabaseEncryptionConfig.EncryptionType.GOOGLE_DEFAULT_ENCRYPTION, ) database = shared_instance.database( - restored_id, encryption_config=encryption_config, + restored_id, + encryption_config=encryption_config, ) databases_to_delete.append(database) operation = database.restore(source=backup) @@ -200,7 +204,9 @@ def test_backup_workflow( def test_copy_backup_workflow( - shared_instance, shared_backup, backups_to_delete, + shared_instance, + shared_backup, + backups_to_delete, ): from google.cloud.spanner_admin_database_v1 import ( CopyBackupEncryptionConfig, @@ -256,7 +262,10 @@ def test_copy_backup_workflow( def test_backup_create_w_version_time_dflt_to_create_time( - shared_instance, shared_database, backups_to_delete, databases_to_delete, + shared_instance, + shared_database, + backups_to_delete, + databases_to_delete, ): backup_id = _helpers.unique_id("backup_id", separator="_") expire_time = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta( @@ -265,7 +274,9 @@ def test_backup_create_w_version_time_dflt_to_create_time( # Create backup. backup = shared_instance.backup( - backup_id, database=shared_database, expire_time=expire_time, + backup_id, + database=shared_database, + expire_time=expire_time, ) operation = backup.create() backups_to_delete.append(backup) @@ -300,7 +311,8 @@ def test_backup_create_w_invalid_expire_time(shared_instance, shared_database): def test_backup_create_w_invalid_version_time_past( - shared_instance, shared_database, + shared_instance, + shared_database, ): backup_id = _helpers.unique_id("backup_id", separator="_") expire_time = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta( @@ -323,7 +335,8 @@ def test_backup_create_w_invalid_version_time_past( def test_backup_create_w_invalid_version_time_future( - shared_instance, shared_database, + shared_instance, + shared_database, ): backup_id = _helpers.unique_id("backup_id", separator="_") expire_time = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta( @@ -359,7 +372,9 @@ def test_database_restore_to_diff_instance( # Create backup. backup = shared_instance.backup( - backup_id, database=shared_database, expire_time=expire_time, + backup_id, + database=shared_database, + expire_time=expire_time, ) op = backup.create() backups_to_delete.append(backup) @@ -439,7 +454,10 @@ def test_multi_create_cancel_update_error_restore_errors( def test_instance_list_backups( - shared_instance, shared_database, second_database, backups_to_delete, + shared_instance, + shared_database, + second_database, + backups_to_delete, ): # Remove un-scrubbed backups FBO count below. _helpers.scrub_instance_backups(shared_instance) @@ -453,7 +471,9 @@ def test_instance_list_backups( expire_time_1_stamp = expire_time_1.strftime("%Y-%m-%dT%H:%M:%S.%fZ") backup1 = shared_instance.backup( - backup_id_1, database=shared_database, expire_time=expire_time_1, + backup_id_1, + database=shared_database, + expire_time=expire_time_1, ) expire_time_2 = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta( diff --git a/tests/system/test_database_api.py b/tests/system/test_database_api.py index d702748a53..09f6d0e038 100644 --- a/tests/system/test_database_api.py +++ b/tests/system/test_database_api.py @@ -207,7 +207,9 @@ def test_update_ddl_w_operation_id(shared_instance, databases_to_delete): def test_update_ddl_w_pitr_invalid( - not_emulator, shared_instance, databases_to_delete, + not_emulator, + shared_instance, + databases_to_delete, ): pool = spanner_v1.BurstyPool(labels={"testcase": "update_database_ddl_pitr"}) temp_db_id = _helpers.unique_id("pitr_upd_ddl_inv", separator="_") @@ -229,7 +231,9 @@ def test_update_ddl_w_pitr_invalid( def test_update_ddl_w_pitr_success( - not_emulator, shared_instance, databases_to_delete, + not_emulator, + shared_instance, + databases_to_delete, ): pool = spanner_v1.BurstyPool(labels={"testcase": "update_database_ddl_pitr"}) temp_db_id = _helpers.unique_id("pitr_upd_ddl_inv", separator="_") @@ -255,7 +259,9 @@ def test_update_ddl_w_pitr_success( def test_update_ddl_w_default_leader_success( - not_emulator, multiregion_instance, databases_to_delete, + not_emulator, + multiregion_instance, + databases_to_delete, ): pool = spanner_v1.BurstyPool( labels={"testcase": "update_database_ddl_default_leader"}, diff --git a/tests/system/test_dbapi.py b/tests/system/test_dbapi.py index 49efc7e3f4..9557a46b37 100644 --- a/tests/system/test_dbapi.py +++ b/tests/system/test_dbapi.py @@ -45,7 +45,9 @@ def raw_database(shared_instance, database_operation_timeout): databse_id = _helpers.unique_id("dbapi-txn") pool = spanner_v1.BurstyPool(labels={"testcase": "database_api"}) database = shared_instance.database( - databse_id, ddl_statements=DDL_STATEMENTS, pool=pool, + databse_id, + ddl_statements=DDL_STATEMENTS, + pool=pool, ) op = database.create() op.result(database_operation_timeout) # raises on failure / timeout. @@ -285,7 +287,8 @@ def test_execute_many(shared_instance, dbapi_database): conn.commit() cursor.executemany( - """SELECT * FROM contacts WHERE contact_id = %s""", ((1,), (2,)), + """SELECT * FROM contacts WHERE contact_id = %s""", + ((1,), (2,)), ) res = cursor.fetchall() conn.commit() diff --git a/tests/system/test_instance_api.py b/tests/system/test_instance_api.py index 8992174871..6825e50721 100644 --- a/tests/system/test_instance_api.py +++ b/tests/system/test_instance_api.py @@ -30,7 +30,10 @@ def instances_to_delete(): def test_list_instances( - no_create_instance, spanner_client, existing_instances, shared_instance, + no_create_instance, + spanner_client, + existing_instances, + shared_instance, ): instances = list(spanner_client.list_instances()) diff --git a/tests/system/test_session_api.py b/tests/system/test_session_api.py index 3fc523e46b..09c65970f3 100644 --- a/tests/system/test_session_api.py +++ b/tests/system/test_session_api.py @@ -53,7 +53,9 @@ "sample_array": [23, 76, 19], } ) -JSON_2 = JsonObject({"sample_object": {"name": "Anamika", "id": 2635}},) +JSON_2 = JsonObject( + {"sample_object": {"name": "Anamika", "id": 2635}}, +) COUNTERS_TABLE = "counters" COUNTERS_COLUMNS = ("name", "value") @@ -167,7 +169,9 @@ def sessions_database(shared_instance, database_operation_timeout): database_name = _helpers.unique_id("test_sessions", separator="_") pool = spanner_v1.BurstyPool(labels={"testcase": "session_api"}) sessions_database = shared_instance.database( - database_name, ddl_statements=_helpers.DDL_STATEMENTS, pool=pool, + database_name, + ddl_statements=_helpers.DDL_STATEMENTS, + pool=pool, ) operation = sessions_database.create() operation.result(database_operation_timeout) # raises on failure / timeout. @@ -426,7 +430,9 @@ def test_batch_insert_w_commit_timestamp(sessions_database): @_helpers.retry_mabye_aborted_txn def test_transaction_read_and_insert_then_rollback( - sessions_database, ot_exporter, sessions_to_delete, + sessions_database, + ot_exporter, + sessions_to_delete, ): sd = _sample_data db_name = sessions_database.name @@ -486,7 +492,9 @@ def test_transaction_read_and_insert_then_rollback( ot_exporter, "CloudSpanner.ReadOnlyTransaction", attributes=_make_attributes( - db_name, table_id=sd.TABLE, columns=sd.COLUMNS, + db_name, + table_id=sd.TABLE, + columns=sd.COLUMNS, ), span=span_list[4], ) @@ -494,7 +502,9 @@ def test_transaction_read_and_insert_then_rollback( ot_exporter, "CloudSpanner.ReadOnlyTransaction", attributes=_make_attributes( - db_name, table_id=sd.TABLE, columns=sd.COLUMNS, + db_name, + table_id=sd.TABLE, + columns=sd.COLUMNS, ), span=span_list[5], ) @@ -508,7 +518,9 @@ def test_transaction_read_and_insert_then_rollback( ot_exporter, "CloudSpanner.ReadOnlyTransaction", attributes=_make_attributes( - db_name, table_id=sd.TABLE, columns=sd.COLUMNS, + db_name, + table_id=sd.TABLE, + columns=sd.COLUMNS, ), span=span_list[7], ) @@ -543,7 +555,8 @@ def _transaction_read_then_raise(transaction): @_helpers.retry_mabye_conflict def test_transaction_read_and_insert_or_update_then_commit( - sessions_database, sessions_to_delete, + sessions_database, + sessions_to_delete, ): # [START spanner_test_dml_read_your_writes] sd = _sample_data @@ -581,7 +594,8 @@ def _generate_insert_statements(): @_helpers.retry_mabye_conflict def test_transaction_execute_sql_w_dml_read_rollback( - sessions_database, sessions_to_delete, + sessions_database, + sessions_to_delete, ): # [START spanner_test_dml_rollback_txn_not_committed] sd = _sample_data @@ -723,7 +737,8 @@ def unit_of_work(transaction): def test_transaction_batch_update_and_execute_dml( - sessions_database, sessions_to_delete, + sessions_database, + sessions_to_delete, ): sd = _sample_data param_types = spanner_v1.param_types @@ -819,10 +834,13 @@ def test_transaction_batch_update_wo_statements(sessions_database, sessions_to_d @pytest.mark.skipif( - not ot_helpers.HAS_OPENTELEMETRY_INSTALLED, reason="trace requires OpenTelemetry", + not ot_helpers.HAS_OPENTELEMETRY_INSTALLED, + reason="trace requires OpenTelemetry", ) def test_transaction_batch_update_w_parent_span( - sessions_database, sessions_to_delete, ot_exporter, + sessions_database, + sessions_to_delete, + ot_exporter, ): from opentelemetry import trace @@ -1093,7 +1111,10 @@ def test_read_with_multiple_keys_index(sessions_database): with sessions_database.snapshot() as snapshot: rows = list( snapshot.read( - sd.TABLE, columns, spanner_v1.KeySet(keys=expected), index="name", + sd.TABLE, + columns, + spanner_v1.KeySet(keys=expected), + index="name", ) ) assert rows == expected @@ -1291,7 +1312,8 @@ def test_read_w_ranges(sessions_database): end = 2000 committed = _set_up_table(sessions_database, row_count) with sessions_database.snapshot( - read_timestamp=committed, multi_use=True, + read_timestamp=committed, + multi_use=True, ) as snapshot: all_data_rows = list(_row_data(row_count)) @@ -1332,7 +1354,8 @@ def test_read_partial_range_until_end(sessions_database): start = 1000 committed = _set_up_table(sessions_database, row_count) with sessions_database.snapshot( - read_timestamp=committed, multi_use=True, + read_timestamp=committed, + multi_use=True, ) as snapshot: all_data_rows = list(_row_data(row_count)) @@ -1376,7 +1399,8 @@ def test_read_partial_range_from_beginning(sessions_database): keyset = spanner_v1.KeySet(ranges=(spanner_v1.KeyRange(**range_kwargs),)) with sessions_database.snapshot( - read_timestamp=committed, multi_use=True, + read_timestamp=committed, + multi_use=True, ) as snapshot: rows = list(snapshot.read(sd.TABLE, sd.COLUMNS, keyset)) expected = expected_map[(start_arg, end_arg)] @@ -1623,7 +1647,13 @@ def test_execute_sql_w_manual_consume(sessions_database): def _check_sql_results( - database, sql, params, param_types, expected, order=True, recurse_into_lists=True, + database, + sql, + params, + param_types, + expected, + order=True, + recurse_into_lists=True, ): if order and "ORDER" not in sql: sql += " ORDER BY pkey" @@ -1886,7 +1916,10 @@ def test_execute_sql_w_numeric_bindings(not_emulator, sessions_database): def test_execute_sql_w_json_bindings(not_emulator, sessions_database): _bind_test_helper( - sessions_database, spanner_v1.TypeCode.JSON, JSON_1, [JSON_1, JSON_2], + sessions_database, + spanner_v1.TypeCode.JSON, + JSON_1, + [JSON_1, JSON_2], ) diff --git a/tests/system/utils/streaming_utils.py b/tests/system/utils/streaming_utils.py index a39637bf0f..174ddae557 100644 --- a/tests/system/utils/streaming_utils.py +++ b/tests/system/utils/streaming_utils.py @@ -26,7 +26,7 @@ class _TableDesc( ) ): def value(self): - return u"X" * self.value_size + return "X" * self.value_size FOUR_KAY = _TableDesc("four_kay", 1000, 4096, 1) diff --git a/tests/unit/gapic/spanner_admin_database_v1/test_database_admin.py b/tests/unit/gapic/spanner_admin_database_v1/test_database_admin.py index 71fb398101..4052f1a787 100644 --- a/tests/unit/gapic/spanner_admin_database_v1/test_database_admin.py +++ b/tests/unit/gapic/spanner_admin_database_v1/test_database_admin.py @@ -106,7 +106,11 @@ def test__get_default_mtls_endpoint(): @pytest.mark.parametrize( - "client_class", [DatabaseAdminClient, DatabaseAdminAsyncClient,] + "client_class", + [ + DatabaseAdminClient, + DatabaseAdminAsyncClient, + ], ) def test_database_admin_client_from_service_account_info(client_class): creds = ga_credentials.AnonymousCredentials() @@ -148,7 +152,11 @@ def test_database_admin_client_service_account_always_use_jwt( @pytest.mark.parametrize( - "client_class", [DatabaseAdminClient, DatabaseAdminAsyncClient,] + "client_class", + [ + DatabaseAdminClient, + DatabaseAdminAsyncClient, + ], ) def test_database_admin_client_from_service_account_file(client_class): creds = ga_credentials.AnonymousCredentials() @@ -512,7 +520,9 @@ def test_database_admin_client_client_options_scopes( client_class, transport_class, transport_name ): # Check the case scopes are provided. - options = client_options.ClientOptions(scopes=["1", "2"],) + options = client_options.ClientOptions( + scopes=["1", "2"], + ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None client = client_class(client_options=options, transport=transport_name) @@ -656,11 +666,16 @@ def test_database_admin_client_create_channel_credentials_file( @pytest.mark.parametrize( - "request_type", [spanner_database_admin.ListDatabasesRequest, dict,] + "request_type", + [ + spanner_database_admin.ListDatabasesRequest, + dict, + ], ) def test_list_databases(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -689,7 +704,8 @@ def test_list_databases_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -706,7 +722,8 @@ async def test_list_databases_async( request_type=spanner_database_admin.ListDatabasesRequest, ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -739,7 +756,9 @@ async def test_list_databases_async_from_dict(): def test_list_databases_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -759,7 +778,10 @@ def test_list_databases_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -788,11 +810,16 @@ async def test_list_databases_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] def test_list_databases_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_databases), "__call__") as call: @@ -800,7 +827,9 @@ def test_list_databases_flattened(): call.return_value = spanner_database_admin.ListDatabasesResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.list_databases(parent="parent_value",) + client.list_databases( + parent="parent_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -812,13 +841,16 @@ def test_list_databases_flattened(): def test_list_databases_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.list_databases( - spanner_database_admin.ListDatabasesRequest(), parent="parent_value", + spanner_database_admin.ListDatabasesRequest(), + parent="parent_value", ) @@ -838,7 +870,9 @@ async def test_list_databases_flattened_async(): ) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.list_databases(parent="parent_value",) + response = await client.list_databases( + parent="parent_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -859,13 +893,15 @@ async def test_list_databases_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.list_databases( - spanner_database_admin.ListDatabasesRequest(), parent="parent_value", + spanner_database_admin.ListDatabasesRequest(), + parent="parent_value", ) def test_list_databases_pager(transport_name: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + credentials=ga_credentials.AnonymousCredentials, + transport=transport_name, ) # Mock the actual call within the gRPC stub, and fake the request. @@ -881,10 +917,14 @@ def test_list_databases_pager(transport_name: str = "grpc"): next_page_token="abc", ), spanner_database_admin.ListDatabasesResponse( - databases=[], next_page_token="def", + databases=[], + next_page_token="def", ), spanner_database_admin.ListDatabasesResponse( - databases=[spanner_database_admin.Database(),], next_page_token="ghi", + databases=[ + spanner_database_admin.Database(), + ], + next_page_token="ghi", ), spanner_database_admin.ListDatabasesResponse( databases=[ @@ -910,7 +950,8 @@ def test_list_databases_pager(transport_name: str = "grpc"): def test_list_databases_pages(transport_name: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + credentials=ga_credentials.AnonymousCredentials, + transport=transport_name, ) # Mock the actual call within the gRPC stub, and fake the request. @@ -926,10 +967,14 @@ def test_list_databases_pages(transport_name: str = "grpc"): next_page_token="abc", ), spanner_database_admin.ListDatabasesResponse( - databases=[], next_page_token="def", + databases=[], + next_page_token="def", ), spanner_database_admin.ListDatabasesResponse( - databases=[spanner_database_admin.Database(),], next_page_token="ghi", + databases=[ + spanner_database_admin.Database(), + ], + next_page_token="ghi", ), spanner_database_admin.ListDatabasesResponse( databases=[ @@ -946,7 +991,9 @@ def test_list_databases_pages(transport_name: str = "grpc"): @pytest.mark.asyncio async def test_list_databases_async_pager(): - client = DatabaseAdminAsyncClient(credentials=ga_credentials.AnonymousCredentials,) + client = DatabaseAdminAsyncClient( + credentials=ga_credentials.AnonymousCredentials, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -963,10 +1010,14 @@ async def test_list_databases_async_pager(): next_page_token="abc", ), spanner_database_admin.ListDatabasesResponse( - databases=[], next_page_token="def", + databases=[], + next_page_token="def", ), spanner_database_admin.ListDatabasesResponse( - databases=[spanner_database_admin.Database(),], next_page_token="ghi", + databases=[ + spanner_database_admin.Database(), + ], + next_page_token="ghi", ), spanner_database_admin.ListDatabasesResponse( databases=[ @@ -976,7 +1027,9 @@ async def test_list_databases_async_pager(): ), RuntimeError, ) - async_pager = await client.list_databases(request={},) + async_pager = await client.list_databases( + request={}, + ) assert async_pager.next_page_token == "abc" responses = [] async for response in async_pager: @@ -988,7 +1041,9 @@ async def test_list_databases_async_pager(): @pytest.mark.asyncio async def test_list_databases_async_pages(): - client = DatabaseAdminAsyncClient(credentials=ga_credentials.AnonymousCredentials,) + client = DatabaseAdminAsyncClient( + credentials=ga_credentials.AnonymousCredentials, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -1005,10 +1060,14 @@ async def test_list_databases_async_pages(): next_page_token="abc", ), spanner_database_admin.ListDatabasesResponse( - databases=[], next_page_token="def", + databases=[], + next_page_token="def", ), spanner_database_admin.ListDatabasesResponse( - databases=[spanner_database_admin.Database(),], next_page_token="ghi", + databases=[ + spanner_database_admin.Database(), + ], + next_page_token="ghi", ), spanner_database_admin.ListDatabasesResponse( databases=[ @@ -1026,11 +1085,16 @@ async def test_list_databases_async_pages(): @pytest.mark.parametrize( - "request_type", [spanner_database_admin.CreateDatabaseRequest, dict,] + "request_type", + [ + spanner_database_admin.CreateDatabaseRequest, + dict, + ], ) def test_create_database(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1056,7 +1120,8 @@ def test_create_database_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1073,7 +1138,8 @@ async def test_create_database_async( request_type=spanner_database_admin.CreateDatabaseRequest, ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1103,7 +1169,9 @@ async def test_create_database_async_from_dict(): def test_create_database_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1123,7 +1191,10 @@ def test_create_database_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -1152,11 +1223,16 @@ async def test_create_database_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] def test_create_database_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.create_database), "__call__") as call: @@ -1165,7 +1241,8 @@ def test_create_database_flattened(): # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. client.create_database( - parent="parent_value", create_statement="create_statement_value", + parent="parent_value", + create_statement="create_statement_value", ) # Establish that the underlying call was made with the expected @@ -1181,7 +1258,9 @@ def test_create_database_flattened(): def test_create_database_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -1210,7 +1289,8 @@ async def test_create_database_flattened_async(): # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. response = await client.create_database( - parent="parent_value", create_statement="create_statement_value", + parent="parent_value", + create_statement="create_statement_value", ) # Establish that the underlying call was made with the expected @@ -1242,11 +1322,16 @@ async def test_create_database_flattened_error_async(): @pytest.mark.parametrize( - "request_type", [spanner_database_admin.GetDatabaseRequest, dict,] + "request_type", + [ + spanner_database_admin.GetDatabaseRequest, + dict, + ], ) def test_get_database(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1283,7 +1368,8 @@ def test_get_database_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1300,7 +1386,8 @@ async def test_get_database_async( request_type=spanner_database_admin.GetDatabaseRequest, ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1341,7 +1428,9 @@ async def test_get_database_async_from_dict(): def test_get_database_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1361,7 +1450,10 @@ def test_get_database_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -1390,11 +1482,16 @@ async def test_get_database_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] def test_get_database_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.get_database), "__call__") as call: @@ -1402,7 +1499,9 @@ def test_get_database_flattened(): call.return_value = spanner_database_admin.Database() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.get_database(name="name_value",) + client.get_database( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1414,13 +1513,16 @@ def test_get_database_flattened(): def test_get_database_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.get_database( - spanner_database_admin.GetDatabaseRequest(), name="name_value", + spanner_database_admin.GetDatabaseRequest(), + name="name_value", ) @@ -1440,7 +1542,9 @@ async def test_get_database_flattened_async(): ) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.get_database(name="name_value",) + response = await client.get_database( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1461,16 +1565,22 @@ async def test_get_database_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.get_database( - spanner_database_admin.GetDatabaseRequest(), name="name_value", + spanner_database_admin.GetDatabaseRequest(), + name="name_value", ) @pytest.mark.parametrize( - "request_type", [spanner_database_admin.UpdateDatabaseDdlRequest, dict,] + "request_type", + [ + spanner_database_admin.UpdateDatabaseDdlRequest, + dict, + ], ) def test_update_database_ddl(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1498,7 +1608,8 @@ def test_update_database_ddl_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1517,7 +1628,8 @@ async def test_update_database_ddl_async( request_type=spanner_database_admin.UpdateDatabaseDdlRequest, ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1549,7 +1661,9 @@ async def test_update_database_ddl_async_from_dict(): def test_update_database_ddl_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1571,7 +1685,10 @@ def test_update_database_ddl_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "database=database/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "database=database/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -1602,11 +1719,16 @@ async def test_update_database_ddl_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "database=database/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "database=database/value", + ) in kw["metadata"] def test_update_database_ddl_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -1617,7 +1739,8 @@ def test_update_database_ddl_flattened(): # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. client.update_database_ddl( - database="database_value", statements=["statements_value"], + database="database_value", + statements=["statements_value"], ) # Establish that the underlying call was made with the expected @@ -1633,7 +1756,9 @@ def test_update_database_ddl_flattened(): def test_update_database_ddl_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -1664,7 +1789,8 @@ async def test_update_database_ddl_flattened_async(): # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. response = await client.update_database_ddl( - database="database_value", statements=["statements_value"], + database="database_value", + statements=["statements_value"], ) # Establish that the underlying call was made with the expected @@ -1696,11 +1822,16 @@ async def test_update_database_ddl_flattened_error_async(): @pytest.mark.parametrize( - "request_type", [spanner_database_admin.DropDatabaseRequest, dict,] + "request_type", + [ + spanner_database_admin.DropDatabaseRequest, + dict, + ], ) def test_drop_database(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1726,7 +1857,8 @@ def test_drop_database_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1743,7 +1875,8 @@ async def test_drop_database_async( request_type=spanner_database_admin.DropDatabaseRequest, ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1771,7 +1904,9 @@ async def test_drop_database_async_from_dict(): def test_drop_database_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1791,7 +1926,10 @@ def test_drop_database_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "database=database/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "database=database/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -1818,11 +1956,16 @@ async def test_drop_database_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "database=database/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "database=database/value", + ) in kw["metadata"] def test_drop_database_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.drop_database), "__call__") as call: @@ -1830,7 +1973,9 @@ def test_drop_database_flattened(): call.return_value = None # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.drop_database(database="database_value",) + client.drop_database( + database="database_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1842,13 +1987,16 @@ def test_drop_database_flattened(): def test_drop_database_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.drop_database( - spanner_database_admin.DropDatabaseRequest(), database="database_value", + spanner_database_admin.DropDatabaseRequest(), + database="database_value", ) @@ -1866,7 +2014,9 @@ async def test_drop_database_flattened_async(): call.return_value = grpc_helpers_async.FakeUnaryUnaryCall(None) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.drop_database(database="database_value",) + response = await client.drop_database( + database="database_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1887,16 +2037,22 @@ async def test_drop_database_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.drop_database( - spanner_database_admin.DropDatabaseRequest(), database="database_value", + spanner_database_admin.DropDatabaseRequest(), + database="database_value", ) @pytest.mark.parametrize( - "request_type", [spanner_database_admin.GetDatabaseDdlRequest, dict,] + "request_type", + [ + spanner_database_admin.GetDatabaseDdlRequest, + dict, + ], ) def test_get_database_ddl(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1925,7 +2081,8 @@ def test_get_database_ddl_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1942,7 +2099,8 @@ async def test_get_database_ddl_async( request_type=spanner_database_admin.GetDatabaseDdlRequest, ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1975,7 +2133,9 @@ async def test_get_database_ddl_async_from_dict(): def test_get_database_ddl_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1995,7 +2155,10 @@ def test_get_database_ddl_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "database=database/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "database=database/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -2024,11 +2187,16 @@ async def test_get_database_ddl_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "database=database/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "database=database/value", + ) in kw["metadata"] def test_get_database_ddl_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.get_database_ddl), "__call__") as call: @@ -2036,7 +2204,9 @@ def test_get_database_ddl_flattened(): call.return_value = spanner_database_admin.GetDatabaseDdlResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.get_database_ddl(database="database_value",) + client.get_database_ddl( + database="database_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -2048,13 +2218,16 @@ def test_get_database_ddl_flattened(): def test_get_database_ddl_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.get_database_ddl( - spanner_database_admin.GetDatabaseDdlRequest(), database="database_value", + spanner_database_admin.GetDatabaseDdlRequest(), + database="database_value", ) @@ -2074,7 +2247,9 @@ async def test_get_database_ddl_flattened_async(): ) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.get_database_ddl(database="database_value",) + response = await client.get_database_ddl( + database="database_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -2095,14 +2270,22 @@ async def test_get_database_ddl_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.get_database_ddl( - spanner_database_admin.GetDatabaseDdlRequest(), database="database_value", + spanner_database_admin.GetDatabaseDdlRequest(), + database="database_value", ) -@pytest.mark.parametrize("request_type", [iam_policy_pb2.SetIamPolicyRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + iam_policy_pb2.SetIamPolicyRequest, + dict, + ], +) def test_set_iam_policy(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2112,7 +2295,10 @@ def test_set_iam_policy(request_type, transport: str = "grpc"): # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.set_iam_policy), "__call__") as call: # Designate an appropriate return value for the call. - call.return_value = policy_pb2.Policy(version=774, etag=b"etag_blob",) + call.return_value = policy_pb2.Policy( + version=774, + etag=b"etag_blob", + ) response = client.set_iam_policy(request) # Establish that the underlying gRPC stub method was called. @@ -2130,7 +2316,8 @@ def test_set_iam_policy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -2146,7 +2333,8 @@ async def test_set_iam_policy_async( transport: str = "grpc_asyncio", request_type=iam_policy_pb2.SetIamPolicyRequest ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2157,7 +2345,10 @@ async def test_set_iam_policy_async( with mock.patch.object(type(client.transport.set_iam_policy), "__call__") as call: # Designate an appropriate return value for the call. call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( - policy_pb2.Policy(version=774, etag=b"etag_blob",) + policy_pb2.Policy( + version=774, + etag=b"etag_blob", + ) ) response = await client.set_iam_policy(request) @@ -2178,7 +2369,9 @@ async def test_set_iam_policy_async_from_dict(): def test_set_iam_policy_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2198,7 +2391,10 @@ def test_set_iam_policy_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "resource=resource/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "resource=resource/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -2225,11 +2421,16 @@ async def test_set_iam_policy_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "resource=resource/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "resource=resource/value", + ) in kw["metadata"] def test_set_iam_policy_from_dict_foreign(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.set_iam_policy), "__call__") as call: # Designate an appropriate return value for the call. @@ -2244,7 +2445,9 @@ def test_set_iam_policy_from_dict_foreign(): def test_set_iam_policy_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.set_iam_policy), "__call__") as call: @@ -2252,7 +2455,9 @@ def test_set_iam_policy_flattened(): call.return_value = policy_pb2.Policy() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.set_iam_policy(resource="resource_value",) + client.set_iam_policy( + resource="resource_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -2264,13 +2469,16 @@ def test_set_iam_policy_flattened(): def test_set_iam_policy_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.set_iam_policy( - iam_policy_pb2.SetIamPolicyRequest(), resource="resource_value", + iam_policy_pb2.SetIamPolicyRequest(), + resource="resource_value", ) @@ -2288,7 +2496,9 @@ async def test_set_iam_policy_flattened_async(): call.return_value = grpc_helpers_async.FakeUnaryUnaryCall(policy_pb2.Policy()) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.set_iam_policy(resource="resource_value",) + response = await client.set_iam_policy( + resource="resource_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -2309,14 +2519,22 @@ async def test_set_iam_policy_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.set_iam_policy( - iam_policy_pb2.SetIamPolicyRequest(), resource="resource_value", + iam_policy_pb2.SetIamPolicyRequest(), + resource="resource_value", ) -@pytest.mark.parametrize("request_type", [iam_policy_pb2.GetIamPolicyRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + iam_policy_pb2.GetIamPolicyRequest, + dict, + ], +) def test_get_iam_policy(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2326,7 +2544,10 @@ def test_get_iam_policy(request_type, transport: str = "grpc"): # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.get_iam_policy), "__call__") as call: # Designate an appropriate return value for the call. - call.return_value = policy_pb2.Policy(version=774, etag=b"etag_blob",) + call.return_value = policy_pb2.Policy( + version=774, + etag=b"etag_blob", + ) response = client.get_iam_policy(request) # Establish that the underlying gRPC stub method was called. @@ -2344,7 +2565,8 @@ def test_get_iam_policy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -2360,7 +2582,8 @@ async def test_get_iam_policy_async( transport: str = "grpc_asyncio", request_type=iam_policy_pb2.GetIamPolicyRequest ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2371,7 +2594,10 @@ async def test_get_iam_policy_async( with mock.patch.object(type(client.transport.get_iam_policy), "__call__") as call: # Designate an appropriate return value for the call. call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( - policy_pb2.Policy(version=774, etag=b"etag_blob",) + policy_pb2.Policy( + version=774, + etag=b"etag_blob", + ) ) response = await client.get_iam_policy(request) @@ -2392,7 +2618,9 @@ async def test_get_iam_policy_async_from_dict(): def test_get_iam_policy_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2412,7 +2640,10 @@ def test_get_iam_policy_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "resource=resource/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "resource=resource/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -2439,11 +2670,16 @@ async def test_get_iam_policy_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "resource=resource/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "resource=resource/value", + ) in kw["metadata"] def test_get_iam_policy_from_dict_foreign(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.get_iam_policy), "__call__") as call: # Designate an appropriate return value for the call. @@ -2458,7 +2694,9 @@ def test_get_iam_policy_from_dict_foreign(): def test_get_iam_policy_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.get_iam_policy), "__call__") as call: @@ -2466,7 +2704,9 @@ def test_get_iam_policy_flattened(): call.return_value = policy_pb2.Policy() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.get_iam_policy(resource="resource_value",) + client.get_iam_policy( + resource="resource_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -2478,13 +2718,16 @@ def test_get_iam_policy_flattened(): def test_get_iam_policy_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.get_iam_policy( - iam_policy_pb2.GetIamPolicyRequest(), resource="resource_value", + iam_policy_pb2.GetIamPolicyRequest(), + resource="resource_value", ) @@ -2502,7 +2745,9 @@ async def test_get_iam_policy_flattened_async(): call.return_value = grpc_helpers_async.FakeUnaryUnaryCall(policy_pb2.Policy()) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.get_iam_policy(resource="resource_value",) + response = await client.get_iam_policy( + resource="resource_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -2523,16 +2768,22 @@ async def test_get_iam_policy_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.get_iam_policy( - iam_policy_pb2.GetIamPolicyRequest(), resource="resource_value", + iam_policy_pb2.GetIamPolicyRequest(), + resource="resource_value", ) @pytest.mark.parametrize( - "request_type", [iam_policy_pb2.TestIamPermissionsRequest, dict,] + "request_type", + [ + iam_policy_pb2.TestIamPermissionsRequest, + dict, + ], ) def test_test_iam_permissions(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2563,7 +2814,8 @@ def test_test_iam_permissions_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -2582,7 +2834,8 @@ async def test_test_iam_permissions_async( request_type=iam_policy_pb2.TestIamPermissionsRequest, ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2617,7 +2870,9 @@ async def test_test_iam_permissions_async_from_dict(): def test_test_iam_permissions_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2639,7 +2894,10 @@ def test_test_iam_permissions_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "resource=resource/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "resource=resource/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -2670,11 +2928,16 @@ async def test_test_iam_permissions_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "resource=resource/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "resource=resource/value", + ) in kw["metadata"] def test_test_iam_permissions_from_dict_foreign(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( type(client.transport.test_iam_permissions), "__call__" @@ -2691,7 +2954,9 @@ def test_test_iam_permissions_from_dict_foreign(): def test_test_iam_permissions_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -2702,7 +2967,8 @@ def test_test_iam_permissions_flattened(): # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. client.test_iam_permissions( - resource="resource_value", permissions=["permissions_value"], + resource="resource_value", + permissions=["permissions_value"], ) # Establish that the underlying call was made with the expected @@ -2718,7 +2984,9 @@ def test_test_iam_permissions_flattened(): def test_test_iam_permissions_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -2749,7 +3017,8 @@ async def test_test_iam_permissions_flattened_async(): # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. response = await client.test_iam_permissions( - resource="resource_value", permissions=["permissions_value"], + resource="resource_value", + permissions=["permissions_value"], ) # Establish that the underlying call was made with the expected @@ -2780,10 +3049,17 @@ async def test_test_iam_permissions_flattened_error_async(): ) -@pytest.mark.parametrize("request_type", [gsad_backup.CreateBackupRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + gsad_backup.CreateBackupRequest, + dict, + ], +) def test_create_backup(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2809,7 +3085,8 @@ def test_create_backup_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -2825,7 +3102,8 @@ async def test_create_backup_async( transport: str = "grpc_asyncio", request_type=gsad_backup.CreateBackupRequest ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2855,7 +3133,9 @@ async def test_create_backup_async_from_dict(): def test_create_backup_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2875,7 +3155,10 @@ def test_create_backup_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -2904,11 +3187,16 @@ async def test_create_backup_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] def test_create_backup_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.create_backup), "__call__") as call: @@ -2938,7 +3226,9 @@ def test_create_backup_flattened(): def test_create_backup_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -3005,10 +3295,17 @@ async def test_create_backup_flattened_error_async(): ) -@pytest.mark.parametrize("request_type", [backup.CopyBackupRequest, dict,]) -def test_copy_backup(request_type, transport: str = "grpc"): +@pytest.mark.parametrize( + "request_type", + [ + backup.CopyBackupRequest, + dict, + ], +) +def test_copy_backup(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3034,7 +3331,8 @@ def test_copy_backup_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -3050,7 +3348,8 @@ async def test_copy_backup_async( transport: str = "grpc_asyncio", request_type=backup.CopyBackupRequest ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3080,7 +3379,9 @@ async def test_copy_backup_async_from_dict(): def test_copy_backup_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -3100,7 +3401,10 @@ def test_copy_backup_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -3129,11 +3433,16 @@ async def test_copy_backup_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] def test_copy_backup_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.copy_backup), "__call__") as call: @@ -3167,7 +3476,9 @@ def test_copy_backup_flattened(): def test_copy_backup_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -3240,10 +3551,17 @@ async def test_copy_backup_flattened_error_async(): ) -@pytest.mark.parametrize("request_type", [backup.GetBackupRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + backup.GetBackupRequest, + dict, + ], +) def test_get_backup(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3284,7 +3602,8 @@ def test_get_backup_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -3300,7 +3619,8 @@ async def test_get_backup_async( transport: str = "grpc_asyncio", request_type=backup.GetBackupRequest ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3345,7 +3665,9 @@ async def test_get_backup_async_from_dict(): def test_get_backup_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -3365,7 +3687,10 @@ def test_get_backup_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -3392,11 +3717,16 @@ async def test_get_backup_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] def test_get_backup_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.get_backup), "__call__") as call: @@ -3404,7 +3734,9 @@ def test_get_backup_flattened(): call.return_value = backup.Backup() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.get_backup(name="name_value",) + client.get_backup( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -3416,13 +3748,16 @@ def test_get_backup_flattened(): def test_get_backup_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.get_backup( - backup.GetBackupRequest(), name="name_value", + backup.GetBackupRequest(), + name="name_value", ) @@ -3440,7 +3775,9 @@ async def test_get_backup_flattened_async(): call.return_value = grpc_helpers_async.FakeUnaryUnaryCall(backup.Backup()) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.get_backup(name="name_value",) + response = await client.get_backup( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -3461,14 +3798,22 @@ async def test_get_backup_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.get_backup( - backup.GetBackupRequest(), name="name_value", + backup.GetBackupRequest(), + name="name_value", ) -@pytest.mark.parametrize("request_type", [gsad_backup.UpdateBackupRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + gsad_backup.UpdateBackupRequest, + dict, + ], +) def test_update_backup(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3509,7 +3854,8 @@ def test_update_backup_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -3525,7 +3871,8 @@ async def test_update_backup_async( transport: str = "grpc_asyncio", request_type=gsad_backup.UpdateBackupRequest ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3570,7 +3917,9 @@ async def test_update_backup_async_from_dict(): def test_update_backup_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -3590,7 +3939,10 @@ def test_update_backup_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "backup.name=backup.name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "backup.name=backup.name/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -3617,11 +3969,16 @@ async def test_update_backup_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "backup.name=backup.name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "backup.name=backup.name/value", + ) in kw["metadata"] def test_update_backup_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.update_backup), "__call__") as call: @@ -3647,7 +4004,9 @@ def test_update_backup_flattened(): def test_update_backup_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -3706,10 +4065,17 @@ async def test_update_backup_flattened_error_async(): ) -@pytest.mark.parametrize("request_type", [backup.DeleteBackupRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + backup.DeleteBackupRequest, + dict, + ], +) def test_delete_backup(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3735,7 +4101,8 @@ def test_delete_backup_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -3751,7 +4118,8 @@ async def test_delete_backup_async( transport: str = "grpc_asyncio", request_type=backup.DeleteBackupRequest ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3779,7 +4147,9 @@ async def test_delete_backup_async_from_dict(): def test_delete_backup_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -3799,7 +4169,10 @@ def test_delete_backup_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -3826,11 +4199,16 @@ async def test_delete_backup_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] def test_delete_backup_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.delete_backup), "__call__") as call: @@ -3838,7 +4216,9 @@ def test_delete_backup_flattened(): call.return_value = None # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.delete_backup(name="name_value",) + client.delete_backup( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -3850,13 +4230,16 @@ def test_delete_backup_flattened(): def test_delete_backup_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.delete_backup( - backup.DeleteBackupRequest(), name="name_value", + backup.DeleteBackupRequest(), + name="name_value", ) @@ -3874,7 +4257,9 @@ async def test_delete_backup_flattened_async(): call.return_value = grpc_helpers_async.FakeUnaryUnaryCall(None) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.delete_backup(name="name_value",) + response = await client.delete_backup( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -3895,14 +4280,22 @@ async def test_delete_backup_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.delete_backup( - backup.DeleteBackupRequest(), name="name_value", + backup.DeleteBackupRequest(), + name="name_value", ) -@pytest.mark.parametrize("request_type", [backup.ListBackupsRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + backup.ListBackupsRequest, + dict, + ], +) def test_list_backups(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3931,7 +4324,8 @@ def test_list_backups_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -3947,7 +4341,8 @@ async def test_list_backups_async( transport: str = "grpc_asyncio", request_type=backup.ListBackupsRequest ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3958,7 +4353,9 @@ async def test_list_backups_async( with mock.patch.object(type(client.transport.list_backups), "__call__") as call: # Designate an appropriate return value for the call. call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( - backup.ListBackupsResponse(next_page_token="next_page_token_value",) + backup.ListBackupsResponse( + next_page_token="next_page_token_value", + ) ) response = await client.list_backups(request) @@ -3978,7 +4375,9 @@ async def test_list_backups_async_from_dict(): def test_list_backups_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -3998,7 +4397,10 @@ def test_list_backups_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -4027,11 +4429,16 @@ async def test_list_backups_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] def test_list_backups_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_backups), "__call__") as call: @@ -4039,7 +4446,9 @@ def test_list_backups_flattened(): call.return_value = backup.ListBackupsResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.list_backups(parent="parent_value",) + client.list_backups( + parent="parent_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -4051,13 +4460,16 @@ def test_list_backups_flattened(): def test_list_backups_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.list_backups( - backup.ListBackupsRequest(), parent="parent_value", + backup.ListBackupsRequest(), + parent="parent_value", ) @@ -4077,7 +4489,9 @@ async def test_list_backups_flattened_async(): ) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.list_backups(parent="parent_value",) + response = await client.list_backups( + parent="parent_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -4098,13 +4512,15 @@ async def test_list_backups_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.list_backups( - backup.ListBackupsRequest(), parent="parent_value", + backup.ListBackupsRequest(), + parent="parent_value", ) def test_list_backups_pager(transport_name: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + credentials=ga_credentials.AnonymousCredentials, + transport=transport_name, ) # Mock the actual call within the gRPC stub, and fake the request. @@ -4112,14 +4528,29 @@ def test_list_backups_pager(transport_name: str = "grpc"): # Set the response to a series of pages. call.side_effect = ( backup.ListBackupsResponse( - backups=[backup.Backup(), backup.Backup(), backup.Backup(),], + backups=[ + backup.Backup(), + backup.Backup(), + backup.Backup(), + ], next_page_token="abc", ), - backup.ListBackupsResponse(backups=[], next_page_token="def",), backup.ListBackupsResponse( - backups=[backup.Backup(),], next_page_token="ghi", + backups=[], + next_page_token="def", + ), + backup.ListBackupsResponse( + backups=[ + backup.Backup(), + ], + next_page_token="ghi", + ), + backup.ListBackupsResponse( + backups=[ + backup.Backup(), + backup.Backup(), + ], ), - backup.ListBackupsResponse(backups=[backup.Backup(), backup.Backup(),],), RuntimeError, ) @@ -4138,7 +4569,8 @@ def test_list_backups_pager(transport_name: str = "grpc"): def test_list_backups_pages(transport_name: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + credentials=ga_credentials.AnonymousCredentials, + transport=transport_name, ) # Mock the actual call within the gRPC stub, and fake the request. @@ -4146,14 +4578,29 @@ def test_list_backups_pages(transport_name: str = "grpc"): # Set the response to a series of pages. call.side_effect = ( backup.ListBackupsResponse( - backups=[backup.Backup(), backup.Backup(), backup.Backup(),], + backups=[ + backup.Backup(), + backup.Backup(), + backup.Backup(), + ], next_page_token="abc", ), - backup.ListBackupsResponse(backups=[], next_page_token="def",), backup.ListBackupsResponse( - backups=[backup.Backup(),], next_page_token="ghi", + backups=[], + next_page_token="def", + ), + backup.ListBackupsResponse( + backups=[ + backup.Backup(), + ], + next_page_token="ghi", + ), + backup.ListBackupsResponse( + backups=[ + backup.Backup(), + backup.Backup(), + ], ), - backup.ListBackupsResponse(backups=[backup.Backup(), backup.Backup(),],), RuntimeError, ) pages = list(client.list_backups(request={}).pages) @@ -4163,7 +4610,9 @@ def test_list_backups_pages(transport_name: str = "grpc"): @pytest.mark.asyncio async def test_list_backups_async_pager(): - client = DatabaseAdminAsyncClient(credentials=ga_credentials.AnonymousCredentials,) + client = DatabaseAdminAsyncClient( + credentials=ga_credentials.AnonymousCredentials, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -4172,17 +4621,34 @@ async def test_list_backups_async_pager(): # Set the response to a series of pages. call.side_effect = ( backup.ListBackupsResponse( - backups=[backup.Backup(), backup.Backup(), backup.Backup(),], + backups=[ + backup.Backup(), + backup.Backup(), + backup.Backup(), + ], next_page_token="abc", ), - backup.ListBackupsResponse(backups=[], next_page_token="def",), backup.ListBackupsResponse( - backups=[backup.Backup(),], next_page_token="ghi", + backups=[], + next_page_token="def", + ), + backup.ListBackupsResponse( + backups=[ + backup.Backup(), + ], + next_page_token="ghi", + ), + backup.ListBackupsResponse( + backups=[ + backup.Backup(), + backup.Backup(), + ], ), - backup.ListBackupsResponse(backups=[backup.Backup(), backup.Backup(),],), RuntimeError, ) - async_pager = await client.list_backups(request={},) + async_pager = await client.list_backups( + request={}, + ) assert async_pager.next_page_token == "abc" responses = [] async for response in async_pager: @@ -4194,7 +4660,9 @@ async def test_list_backups_async_pager(): @pytest.mark.asyncio async def test_list_backups_async_pages(): - client = DatabaseAdminAsyncClient(credentials=ga_credentials.AnonymousCredentials,) + client = DatabaseAdminAsyncClient( + credentials=ga_credentials.AnonymousCredentials, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -4203,14 +4671,29 @@ async def test_list_backups_async_pages(): # Set the response to a series of pages. call.side_effect = ( backup.ListBackupsResponse( - backups=[backup.Backup(), backup.Backup(), backup.Backup(),], + backups=[ + backup.Backup(), + backup.Backup(), + backup.Backup(), + ], next_page_token="abc", ), - backup.ListBackupsResponse(backups=[], next_page_token="def",), backup.ListBackupsResponse( - backups=[backup.Backup(),], next_page_token="ghi", + backups=[], + next_page_token="def", + ), + backup.ListBackupsResponse( + backups=[ + backup.Backup(), + ], + next_page_token="ghi", + ), + backup.ListBackupsResponse( + backups=[ + backup.Backup(), + backup.Backup(), + ], ), - backup.ListBackupsResponse(backups=[backup.Backup(), backup.Backup(),],), RuntimeError, ) pages = [] @@ -4221,11 +4704,16 @@ async def test_list_backups_async_pages(): @pytest.mark.parametrize( - "request_type", [spanner_database_admin.RestoreDatabaseRequest, dict,] + "request_type", + [ + spanner_database_admin.RestoreDatabaseRequest, + dict, + ], ) def test_restore_database(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -4251,7 +4739,8 @@ def test_restore_database_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -4268,7 +4757,8 @@ async def test_restore_database_async( request_type=spanner_database_admin.RestoreDatabaseRequest, ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -4298,7 +4788,9 @@ async def test_restore_database_async_from_dict(): def test_restore_database_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -4318,7 +4810,10 @@ def test_restore_database_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -4347,11 +4842,16 @@ async def test_restore_database_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] def test_restore_database_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.restore_database), "__call__") as call: @@ -4379,7 +4879,9 @@ def test_restore_database_flattened(): def test_restore_database_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -4445,11 +4947,16 @@ async def test_restore_database_flattened_error_async(): @pytest.mark.parametrize( - "request_type", [spanner_database_admin.ListDatabaseOperationsRequest, dict,] + "request_type", + [ + spanner_database_admin.ListDatabaseOperationsRequest, + dict, + ], ) def test_list_database_operations(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -4480,7 +4987,8 @@ def test_list_database_operations_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -4499,7 +5007,8 @@ async def test_list_database_operations_async( request_type=spanner_database_admin.ListDatabaseOperationsRequest, ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -4534,7 +5043,9 @@ async def test_list_database_operations_async_from_dict(): def test_list_database_operations_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -4556,7 +5067,10 @@ def test_list_database_operations_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -4587,11 +5101,16 @@ async def test_list_database_operations_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] def test_list_database_operations_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -4601,7 +5120,9 @@ def test_list_database_operations_flattened(): call.return_value = spanner_database_admin.ListDatabaseOperationsResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.list_database_operations(parent="parent_value",) + client.list_database_operations( + parent="parent_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -4613,7 +5134,9 @@ def test_list_database_operations_flattened(): def test_list_database_operations_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -4642,7 +5165,9 @@ async def test_list_database_operations_flattened_async(): ) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.list_database_operations(parent="parent_value",) + response = await client.list_database_operations( + parent="parent_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -4670,7 +5195,8 @@ async def test_list_database_operations_flattened_error_async(): def test_list_database_operations_pager(transport_name: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + credentials=ga_credentials.AnonymousCredentials, + transport=transport_name, ) # Mock the actual call within the gRPC stub, and fake the request. @@ -4688,13 +5214,20 @@ def test_list_database_operations_pager(transport_name: str = "grpc"): next_page_token="abc", ), spanner_database_admin.ListDatabaseOperationsResponse( - operations=[], next_page_token="def", + operations=[], + next_page_token="def", ), spanner_database_admin.ListDatabaseOperationsResponse( - operations=[operations_pb2.Operation(),], next_page_token="ghi", + operations=[ + operations_pb2.Operation(), + ], + next_page_token="ghi", ), spanner_database_admin.ListDatabaseOperationsResponse( - operations=[operations_pb2.Operation(), operations_pb2.Operation(),], + operations=[ + operations_pb2.Operation(), + operations_pb2.Operation(), + ], ), RuntimeError, ) @@ -4714,7 +5247,8 @@ def test_list_database_operations_pager(transport_name: str = "grpc"): def test_list_database_operations_pages(transport_name: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + credentials=ga_credentials.AnonymousCredentials, + transport=transport_name, ) # Mock the actual call within the gRPC stub, and fake the request. @@ -4732,13 +5266,20 @@ def test_list_database_operations_pages(transport_name: str = "grpc"): next_page_token="abc", ), spanner_database_admin.ListDatabaseOperationsResponse( - operations=[], next_page_token="def", + operations=[], + next_page_token="def", ), spanner_database_admin.ListDatabaseOperationsResponse( - operations=[operations_pb2.Operation(),], next_page_token="ghi", + operations=[ + operations_pb2.Operation(), + ], + next_page_token="ghi", ), spanner_database_admin.ListDatabaseOperationsResponse( - operations=[operations_pb2.Operation(), operations_pb2.Operation(),], + operations=[ + operations_pb2.Operation(), + operations_pb2.Operation(), + ], ), RuntimeError, ) @@ -4749,7 +5290,9 @@ def test_list_database_operations_pages(transport_name: str = "grpc"): @pytest.mark.asyncio async def test_list_database_operations_async_pager(): - client = DatabaseAdminAsyncClient(credentials=ga_credentials.AnonymousCredentials,) + client = DatabaseAdminAsyncClient( + credentials=ga_credentials.AnonymousCredentials, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -4768,17 +5311,26 @@ async def test_list_database_operations_async_pager(): next_page_token="abc", ), spanner_database_admin.ListDatabaseOperationsResponse( - operations=[], next_page_token="def", + operations=[], + next_page_token="def", ), spanner_database_admin.ListDatabaseOperationsResponse( - operations=[operations_pb2.Operation(),], next_page_token="ghi", + operations=[ + operations_pb2.Operation(), + ], + next_page_token="ghi", ), spanner_database_admin.ListDatabaseOperationsResponse( - operations=[operations_pb2.Operation(), operations_pb2.Operation(),], + operations=[ + operations_pb2.Operation(), + operations_pb2.Operation(), + ], ), RuntimeError, ) - async_pager = await client.list_database_operations(request={},) + async_pager = await client.list_database_operations( + request={}, + ) assert async_pager.next_page_token == "abc" responses = [] async for response in async_pager: @@ -4790,7 +5342,9 @@ async def test_list_database_operations_async_pager(): @pytest.mark.asyncio async def test_list_database_operations_async_pages(): - client = DatabaseAdminAsyncClient(credentials=ga_credentials.AnonymousCredentials,) + client = DatabaseAdminAsyncClient( + credentials=ga_credentials.AnonymousCredentials, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -4809,13 +5363,20 @@ async def test_list_database_operations_async_pages(): next_page_token="abc", ), spanner_database_admin.ListDatabaseOperationsResponse( - operations=[], next_page_token="def", + operations=[], + next_page_token="def", ), spanner_database_admin.ListDatabaseOperationsResponse( - operations=[operations_pb2.Operation(),], next_page_token="ghi", + operations=[ + operations_pb2.Operation(), + ], + next_page_token="ghi", ), spanner_database_admin.ListDatabaseOperationsResponse( - operations=[operations_pb2.Operation(), operations_pb2.Operation(),], + operations=[ + operations_pb2.Operation(), + operations_pb2.Operation(), + ], ), RuntimeError, ) @@ -4826,10 +5387,17 @@ async def test_list_database_operations_async_pages(): assert page_.raw_page.next_page_token == token -@pytest.mark.parametrize("request_type", [backup.ListBackupOperationsRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + backup.ListBackupOperationsRequest, + dict, + ], +) def test_list_backup_operations(request_type, transport: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -4860,7 +5428,8 @@ def test_list_backup_operations_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -4878,7 +5447,8 @@ async def test_list_backup_operations_async( transport: str = "grpc_asyncio", request_type=backup.ListBackupOperationsRequest ): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -4913,7 +5483,9 @@ async def test_list_backup_operations_async_from_dict(): def test_list_backup_operations_field_headers(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -4935,7 +5507,10 @@ def test_list_backup_operations_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -4966,11 +5541,16 @@ async def test_list_backup_operations_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] def test_list_backup_operations_flattened(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -4980,7 +5560,9 @@ def test_list_backup_operations_flattened(): call.return_value = backup.ListBackupOperationsResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.list_backup_operations(parent="parent_value",) + client.list_backup_operations( + parent="parent_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -4992,13 +5574,16 @@ def test_list_backup_operations_flattened(): def test_list_backup_operations_flattened_error(): - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.list_backup_operations( - backup.ListBackupOperationsRequest(), parent="parent_value", + backup.ListBackupOperationsRequest(), + parent="parent_value", ) @@ -5020,7 +5605,9 @@ async def test_list_backup_operations_flattened_async(): ) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.list_backup_operations(parent="parent_value",) + response = await client.list_backup_operations( + parent="parent_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -5041,13 +5628,15 @@ async def test_list_backup_operations_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.list_backup_operations( - backup.ListBackupOperationsRequest(), parent="parent_value", + backup.ListBackupOperationsRequest(), + parent="parent_value", ) def test_list_backup_operations_pager(transport_name: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + credentials=ga_credentials.AnonymousCredentials, + transport=transport_name, ) # Mock the actual call within the gRPC stub, and fake the request. @@ -5064,12 +5653,21 @@ def test_list_backup_operations_pager(transport_name: str = "grpc"): ], next_page_token="abc", ), - backup.ListBackupOperationsResponse(operations=[], next_page_token="def",), backup.ListBackupOperationsResponse( - operations=[operations_pb2.Operation(),], next_page_token="ghi", + operations=[], + next_page_token="def", + ), + backup.ListBackupOperationsResponse( + operations=[ + operations_pb2.Operation(), + ], + next_page_token="ghi", ), backup.ListBackupOperationsResponse( - operations=[operations_pb2.Operation(), operations_pb2.Operation(),], + operations=[ + operations_pb2.Operation(), + operations_pb2.Operation(), + ], ), RuntimeError, ) @@ -5089,7 +5687,8 @@ def test_list_backup_operations_pager(transport_name: str = "grpc"): def test_list_backup_operations_pages(transport_name: str = "grpc"): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + credentials=ga_credentials.AnonymousCredentials, + transport=transport_name, ) # Mock the actual call within the gRPC stub, and fake the request. @@ -5106,12 +5705,21 @@ def test_list_backup_operations_pages(transport_name: str = "grpc"): ], next_page_token="abc", ), - backup.ListBackupOperationsResponse(operations=[], next_page_token="def",), backup.ListBackupOperationsResponse( - operations=[operations_pb2.Operation(),], next_page_token="ghi", + operations=[], + next_page_token="def", + ), + backup.ListBackupOperationsResponse( + operations=[ + operations_pb2.Operation(), + ], + next_page_token="ghi", ), backup.ListBackupOperationsResponse( - operations=[operations_pb2.Operation(), operations_pb2.Operation(),], + operations=[ + operations_pb2.Operation(), + operations_pb2.Operation(), + ], ), RuntimeError, ) @@ -5122,7 +5730,9 @@ def test_list_backup_operations_pages(transport_name: str = "grpc"): @pytest.mark.asyncio async def test_list_backup_operations_async_pager(): - client = DatabaseAdminAsyncClient(credentials=ga_credentials.AnonymousCredentials,) + client = DatabaseAdminAsyncClient( + credentials=ga_credentials.AnonymousCredentials, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -5140,16 +5750,27 @@ async def test_list_backup_operations_async_pager(): ], next_page_token="abc", ), - backup.ListBackupOperationsResponse(operations=[], next_page_token="def",), backup.ListBackupOperationsResponse( - operations=[operations_pb2.Operation(),], next_page_token="ghi", + operations=[], + next_page_token="def", + ), + backup.ListBackupOperationsResponse( + operations=[ + operations_pb2.Operation(), + ], + next_page_token="ghi", ), backup.ListBackupOperationsResponse( - operations=[operations_pb2.Operation(), operations_pb2.Operation(),], + operations=[ + operations_pb2.Operation(), + operations_pb2.Operation(), + ], ), RuntimeError, ) - async_pager = await client.list_backup_operations(request={},) + async_pager = await client.list_backup_operations( + request={}, + ) assert async_pager.next_page_token == "abc" responses = [] async for response in async_pager: @@ -5161,7 +5782,9 @@ async def test_list_backup_operations_async_pager(): @pytest.mark.asyncio async def test_list_backup_operations_async_pages(): - client = DatabaseAdminAsyncClient(credentials=ga_credentials.AnonymousCredentials,) + client = DatabaseAdminAsyncClient( + credentials=ga_credentials.AnonymousCredentials, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -5179,12 +5802,21 @@ async def test_list_backup_operations_async_pages(): ], next_page_token="abc", ), - backup.ListBackupOperationsResponse(operations=[], next_page_token="def",), backup.ListBackupOperationsResponse( - operations=[operations_pb2.Operation(),], next_page_token="ghi", + operations=[], + next_page_token="def", ), backup.ListBackupOperationsResponse( - operations=[operations_pb2.Operation(), operations_pb2.Operation(),], + operations=[ + operations_pb2.Operation(), + ], + next_page_token="ghi", + ), + backup.ListBackupOperationsResponse( + operations=[ + operations_pb2.Operation(), + operations_pb2.Operation(), + ], ), RuntimeError, ) @@ -5202,7 +5834,8 @@ def test_credentials_transport_error(): ) with pytest.raises(ValueError): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # It is an error to provide a credentials file and a transport instance. @@ -5222,7 +5855,10 @@ def test_credentials_transport_error(): options = client_options.ClientOptions() options.api_key = "api_key" with pytest.raises(ValueError): - client = DatabaseAdminClient(client_options=options, transport=transport,) + client = DatabaseAdminClient( + client_options=options, + transport=transport, + ) # It is an error to provide an api_key and a credential. options = mock.Mock() @@ -5238,7 +5874,8 @@ def test_credentials_transport_error(): ) with pytest.raises(ValueError): client = DatabaseAdminClient( - client_options={"scopes": ["1", "2"]}, transport=transport, + client_options={"scopes": ["1", "2"]}, + transport=transport, ) @@ -5283,8 +5920,13 @@ def test_transport_adc(transport_class): def test_transport_grpc_default(): # A client should use the gRPC transport by default. - client = DatabaseAdminClient(credentials=ga_credentials.AnonymousCredentials(),) - assert isinstance(client.transport, transports.DatabaseAdminGrpcTransport,) + client = DatabaseAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) + assert isinstance( + client.transport, + transports.DatabaseAdminGrpcTransport, + ) def test_database_admin_base_transport_error(): @@ -5351,7 +5993,8 @@ def test_database_admin_base_transport_with_credentials_file(): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.DatabaseAdminTransport( - credentials_file="credentials.json", quota_project_id="octopus", + credentials_file="credentials.json", + quota_project_id="octopus", ) load_creds.assert_called_once_with( "credentials.json", @@ -5521,7 +6164,8 @@ def test_database_admin_grpc_transport_channel(): # Check that channel is used if provided. transport = transports.DatabaseAdminGrpcTransport( - host="squid.clam.whelk", channel=channel, + host="squid.clam.whelk", + channel=channel, ) assert transport.grpc_channel == channel assert transport._host == "squid.clam.whelk:443" @@ -5533,7 +6177,8 @@ def test_database_admin_grpc_asyncio_transport_channel(): # Check that channel is used if provided. transport = transports.DatabaseAdminGrpcAsyncIOTransport( - host="squid.clam.whelk", channel=channel, + host="squid.clam.whelk", + channel=channel, ) assert transport.grpc_channel == channel assert transport._host == "squid.clam.whelk:443" @@ -5640,12 +6285,16 @@ def test_database_admin_transport_channel_mtls_with_adc(transport_class): def test_database_admin_grpc_lro_client(): client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) transport = client.transport # Ensure that we have a api-core operations client. - assert isinstance(transport.operations_client, operations_v1.OperationsClient,) + assert isinstance( + transport.operations_client, + operations_v1.OperationsClient, + ) # Ensure that subsequent calls to the property send the exact same object. assert transport.operations_client is transport.operations_client @@ -5653,12 +6302,16 @@ def test_database_admin_grpc_lro_client(): def test_database_admin_grpc_lro_async_client(): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc_asyncio", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc_asyncio", ) transport = client.transport # Ensure that we have a api-core operations client. - assert isinstance(transport.operations_client, operations_v1.OperationsAsyncClient,) + assert isinstance( + transport.operations_client, + operations_v1.OperationsAsyncClient, + ) # Ensure that subsequent calls to the property send the exact same object. assert transport.operations_client is transport.operations_client @@ -5669,7 +6322,9 @@ def test_backup_path(): instance = "clam" backup = "whelk" expected = "projects/{project}/instances/{instance}/backups/{backup}".format( - project=project, instance=instance, backup=backup, + project=project, + instance=instance, + backup=backup, ) actual = DatabaseAdminClient.backup_path(project, instance, backup) assert expected == actual @@ -5694,7 +6349,10 @@ def test_crypto_key_path(): key_ring = "winkle" crypto_key = "nautilus" expected = "projects/{project}/locations/{location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}".format( - project=project, location=location, key_ring=key_ring, crypto_key=crypto_key, + project=project, + location=location, + key_ring=key_ring, + crypto_key=crypto_key, ) actual = DatabaseAdminClient.crypto_key_path( project, location, key_ring, crypto_key @@ -5755,7 +6413,9 @@ def test_database_path(): instance = "clam" database = "whelk" expected = "projects/{project}/instances/{instance}/databases/{database}".format( - project=project, instance=instance, database=database, + project=project, + instance=instance, + database=database, ) actual = DatabaseAdminClient.database_path(project, instance, database) assert expected == actual @@ -5778,7 +6438,8 @@ def test_instance_path(): project = "cuttlefish" instance = "mussel" expected = "projects/{project}/instances/{instance}".format( - project=project, instance=instance, + project=project, + instance=instance, ) actual = DatabaseAdminClient.instance_path(project, instance) assert expected == actual @@ -5818,7 +6479,9 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): folder = "squid" - expected = "folders/{folder}".format(folder=folder,) + expected = "folders/{folder}".format( + folder=folder, + ) actual = DatabaseAdminClient.common_folder_path(folder) assert expected == actual @@ -5836,7 +6499,9 @@ def test_parse_common_folder_path(): def test_common_organization_path(): organization = "whelk" - expected = "organizations/{organization}".format(organization=organization,) + expected = "organizations/{organization}".format( + organization=organization, + ) actual = DatabaseAdminClient.common_organization_path(organization) assert expected == actual @@ -5854,7 +6519,9 @@ def test_parse_common_organization_path(): def test_common_project_path(): project = "oyster" - expected = "projects/{project}".format(project=project,) + expected = "projects/{project}".format( + project=project, + ) actual = DatabaseAdminClient.common_project_path(project) assert expected == actual @@ -5874,7 +6541,8 @@ def test_common_location_path(): project = "cuttlefish" location = "mussel" expected = "projects/{project}/locations/{location}".format( - project=project, location=location, + project=project, + location=location, ) actual = DatabaseAdminClient.common_location_path(project, location) assert expected == actual @@ -5899,7 +6567,8 @@ def test_client_with_default_client_info(): transports.DatabaseAdminTransport, "_prep_wrapped_messages" ) as prep: client = DatabaseAdminClient( - credentials=ga_credentials.AnonymousCredentials(), client_info=client_info, + credentials=ga_credentials.AnonymousCredentials(), + client_info=client_info, ) prep.assert_called_once_with(client_info) @@ -5908,7 +6577,8 @@ def test_client_with_default_client_info(): ) as prep: transport_class = DatabaseAdminClient.get_transport_class() transport = transport_class( - credentials=ga_credentials.AnonymousCredentials(), client_info=client_info, + credentials=ga_credentials.AnonymousCredentials(), + client_info=client_info, ) prep.assert_called_once_with(client_info) @@ -5916,7 +6586,8 @@ def test_client_with_default_client_info(): @pytest.mark.asyncio async def test_transport_close_async(): client = DatabaseAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc_asyncio", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc_asyncio", ) with mock.patch.object( type(getattr(client.transport, "grpc_channel")), "close" diff --git a/tests/unit/gapic/spanner_admin_instance_v1/test_instance_admin.py b/tests/unit/gapic/spanner_admin_instance_v1/test_instance_admin.py index caef9d05d9..85309bd8ad 100644 --- a/tests/unit/gapic/spanner_admin_instance_v1/test_instance_admin.py +++ b/tests/unit/gapic/spanner_admin_instance_v1/test_instance_admin.py @@ -99,7 +99,11 @@ def test__get_default_mtls_endpoint(): @pytest.mark.parametrize( - "client_class", [InstanceAdminClient, InstanceAdminAsyncClient,] + "client_class", + [ + InstanceAdminClient, + InstanceAdminAsyncClient, + ], ) def test_instance_admin_client_from_service_account_info(client_class): creds = ga_credentials.AnonymousCredentials() @@ -141,7 +145,11 @@ def test_instance_admin_client_service_account_always_use_jwt( @pytest.mark.parametrize( - "client_class", [InstanceAdminClient, InstanceAdminAsyncClient,] + "client_class", + [ + InstanceAdminClient, + InstanceAdminAsyncClient, + ], ) def test_instance_admin_client_from_service_account_file(client_class): creds = ga_credentials.AnonymousCredentials() @@ -505,7 +513,9 @@ def test_instance_admin_client_client_options_scopes( client_class, transport_class, transport_name ): # Check the case scopes are provided. - options = client_options.ClientOptions(scopes=["1", "2"],) + options = client_options.ClientOptions( + scopes=["1", "2"], + ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None client = client_class(client_options=options, transport=transport_name) @@ -649,11 +659,16 @@ def test_instance_admin_client_create_channel_credentials_file( @pytest.mark.parametrize( - "request_type", [spanner_instance_admin.ListInstanceConfigsRequest, dict,] + "request_type", + [ + spanner_instance_admin.ListInstanceConfigsRequest, + dict, + ], ) def test_list_instance_configs(request_type, transport: str = "grpc"): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -684,7 +699,8 @@ def test_list_instance_configs_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -703,7 +719,8 @@ async def test_list_instance_configs_async( request_type=spanner_instance_admin.ListInstanceConfigsRequest, ): client = InstanceAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -738,7 +755,9 @@ async def test_list_instance_configs_async_from_dict(): def test_list_instance_configs_field_headers(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -760,7 +779,10 @@ def test_list_instance_configs_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -791,11 +813,16 @@ async def test_list_instance_configs_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] def test_list_instance_configs_flattened(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -805,7 +832,9 @@ def test_list_instance_configs_flattened(): call.return_value = spanner_instance_admin.ListInstanceConfigsResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.list_instance_configs(parent="parent_value",) + client.list_instance_configs( + parent="parent_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -817,13 +846,16 @@ def test_list_instance_configs_flattened(): def test_list_instance_configs_flattened_error(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.list_instance_configs( - spanner_instance_admin.ListInstanceConfigsRequest(), parent="parent_value", + spanner_instance_admin.ListInstanceConfigsRequest(), + parent="parent_value", ) @@ -845,7 +877,9 @@ async def test_list_instance_configs_flattened_async(): ) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.list_instance_configs(parent="parent_value",) + response = await client.list_instance_configs( + parent="parent_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -866,13 +900,15 @@ async def test_list_instance_configs_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.list_instance_configs( - spanner_instance_admin.ListInstanceConfigsRequest(), parent="parent_value", + spanner_instance_admin.ListInstanceConfigsRequest(), + parent="parent_value", ) def test_list_instance_configs_pager(transport_name: str = "grpc"): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + credentials=ga_credentials.AnonymousCredentials, + transport=transport_name, ) # Mock the actual call within the gRPC stub, and fake the request. @@ -890,10 +926,13 @@ def test_list_instance_configs_pager(transport_name: str = "grpc"): next_page_token="abc", ), spanner_instance_admin.ListInstanceConfigsResponse( - instance_configs=[], next_page_token="def", + instance_configs=[], + next_page_token="def", ), spanner_instance_admin.ListInstanceConfigsResponse( - instance_configs=[spanner_instance_admin.InstanceConfig(),], + instance_configs=[ + spanner_instance_admin.InstanceConfig(), + ], next_page_token="ghi", ), spanner_instance_admin.ListInstanceConfigsResponse( @@ -922,7 +961,8 @@ def test_list_instance_configs_pager(transport_name: str = "grpc"): def test_list_instance_configs_pages(transport_name: str = "grpc"): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + credentials=ga_credentials.AnonymousCredentials, + transport=transport_name, ) # Mock the actual call within the gRPC stub, and fake the request. @@ -940,10 +980,13 @@ def test_list_instance_configs_pages(transport_name: str = "grpc"): next_page_token="abc", ), spanner_instance_admin.ListInstanceConfigsResponse( - instance_configs=[], next_page_token="def", + instance_configs=[], + next_page_token="def", ), spanner_instance_admin.ListInstanceConfigsResponse( - instance_configs=[spanner_instance_admin.InstanceConfig(),], + instance_configs=[ + spanner_instance_admin.InstanceConfig(), + ], next_page_token="ghi", ), spanner_instance_admin.ListInstanceConfigsResponse( @@ -961,7 +1004,9 @@ def test_list_instance_configs_pages(transport_name: str = "grpc"): @pytest.mark.asyncio async def test_list_instance_configs_async_pager(): - client = InstanceAdminAsyncClient(credentials=ga_credentials.AnonymousCredentials,) + client = InstanceAdminAsyncClient( + credentials=ga_credentials.AnonymousCredentials, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -980,10 +1025,13 @@ async def test_list_instance_configs_async_pager(): next_page_token="abc", ), spanner_instance_admin.ListInstanceConfigsResponse( - instance_configs=[], next_page_token="def", + instance_configs=[], + next_page_token="def", ), spanner_instance_admin.ListInstanceConfigsResponse( - instance_configs=[spanner_instance_admin.InstanceConfig(),], + instance_configs=[ + spanner_instance_admin.InstanceConfig(), + ], next_page_token="ghi", ), spanner_instance_admin.ListInstanceConfigsResponse( @@ -994,7 +1042,9 @@ async def test_list_instance_configs_async_pager(): ), RuntimeError, ) - async_pager = await client.list_instance_configs(request={},) + async_pager = await client.list_instance_configs( + request={}, + ) assert async_pager.next_page_token == "abc" responses = [] async for response in async_pager: @@ -1008,7 +1058,9 @@ async def test_list_instance_configs_async_pager(): @pytest.mark.asyncio async def test_list_instance_configs_async_pages(): - client = InstanceAdminAsyncClient(credentials=ga_credentials.AnonymousCredentials,) + client = InstanceAdminAsyncClient( + credentials=ga_credentials.AnonymousCredentials, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -1027,10 +1079,13 @@ async def test_list_instance_configs_async_pages(): next_page_token="abc", ), spanner_instance_admin.ListInstanceConfigsResponse( - instance_configs=[], next_page_token="def", + instance_configs=[], + next_page_token="def", ), spanner_instance_admin.ListInstanceConfigsResponse( - instance_configs=[spanner_instance_admin.InstanceConfig(),], + instance_configs=[ + spanner_instance_admin.InstanceConfig(), + ], next_page_token="ghi", ), spanner_instance_admin.ListInstanceConfigsResponse( @@ -1049,11 +1104,16 @@ async def test_list_instance_configs_async_pages(): @pytest.mark.parametrize( - "request_type", [spanner_instance_admin.GetInstanceConfigRequest, dict,] + "request_type", + [ + spanner_instance_admin.GetInstanceConfigRequest, + dict, + ], ) def test_get_instance_config(request_type, transport: str = "grpc"): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1088,7 +1148,8 @@ def test_get_instance_config_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1107,7 +1168,8 @@ async def test_get_instance_config_async( request_type=spanner_instance_admin.GetInstanceConfigRequest, ): client = InstanceAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1146,7 +1208,9 @@ async def test_get_instance_config_async_from_dict(): def test_get_instance_config_field_headers(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1168,7 +1232,10 @@ def test_get_instance_config_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -1199,11 +1266,16 @@ async def test_get_instance_config_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] def test_get_instance_config_flattened(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -1213,7 +1285,9 @@ def test_get_instance_config_flattened(): call.return_value = spanner_instance_admin.InstanceConfig() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.get_instance_config(name="name_value",) + client.get_instance_config( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1225,13 +1299,16 @@ def test_get_instance_config_flattened(): def test_get_instance_config_flattened_error(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.get_instance_config( - spanner_instance_admin.GetInstanceConfigRequest(), name="name_value", + spanner_instance_admin.GetInstanceConfigRequest(), + name="name_value", ) @@ -1253,7 +1330,9 @@ async def test_get_instance_config_flattened_async(): ) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.get_instance_config(name="name_value",) + response = await client.get_instance_config( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1274,16 +1353,22 @@ async def test_get_instance_config_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.get_instance_config( - spanner_instance_admin.GetInstanceConfigRequest(), name="name_value", + spanner_instance_admin.GetInstanceConfigRequest(), + name="name_value", ) @pytest.mark.parametrize( - "request_type", [spanner_instance_admin.ListInstancesRequest, dict,] + "request_type", + [ + spanner_instance_admin.ListInstancesRequest, + dict, + ], ) def test_list_instances(request_type, transport: str = "grpc"): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1312,7 +1397,8 @@ def test_list_instances_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1329,7 +1415,8 @@ async def test_list_instances_async( request_type=spanner_instance_admin.ListInstancesRequest, ): client = InstanceAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1362,7 +1449,9 @@ async def test_list_instances_async_from_dict(): def test_list_instances_field_headers(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1382,7 +1471,10 @@ def test_list_instances_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -1411,11 +1503,16 @@ async def test_list_instances_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] def test_list_instances_flattened(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_instances), "__call__") as call: @@ -1423,7 +1520,9 @@ def test_list_instances_flattened(): call.return_value = spanner_instance_admin.ListInstancesResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.list_instances(parent="parent_value",) + client.list_instances( + parent="parent_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1435,13 +1534,16 @@ def test_list_instances_flattened(): def test_list_instances_flattened_error(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.list_instances( - spanner_instance_admin.ListInstancesRequest(), parent="parent_value", + spanner_instance_admin.ListInstancesRequest(), + parent="parent_value", ) @@ -1461,7 +1563,9 @@ async def test_list_instances_flattened_async(): ) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.list_instances(parent="parent_value",) + response = await client.list_instances( + parent="parent_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1482,13 +1586,15 @@ async def test_list_instances_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.list_instances( - spanner_instance_admin.ListInstancesRequest(), parent="parent_value", + spanner_instance_admin.ListInstancesRequest(), + parent="parent_value", ) def test_list_instances_pager(transport_name: str = "grpc"): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + credentials=ga_credentials.AnonymousCredentials, + transport=transport_name, ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1504,10 +1610,14 @@ def test_list_instances_pager(transport_name: str = "grpc"): next_page_token="abc", ), spanner_instance_admin.ListInstancesResponse( - instances=[], next_page_token="def", + instances=[], + next_page_token="def", ), spanner_instance_admin.ListInstancesResponse( - instances=[spanner_instance_admin.Instance(),], next_page_token="ghi", + instances=[ + spanner_instance_admin.Instance(), + ], + next_page_token="ghi", ), spanner_instance_admin.ListInstancesResponse( instances=[ @@ -1533,7 +1643,8 @@ def test_list_instances_pager(transport_name: str = "grpc"): def test_list_instances_pages(transport_name: str = "grpc"): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + credentials=ga_credentials.AnonymousCredentials, + transport=transport_name, ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1549,10 +1660,14 @@ def test_list_instances_pages(transport_name: str = "grpc"): next_page_token="abc", ), spanner_instance_admin.ListInstancesResponse( - instances=[], next_page_token="def", + instances=[], + next_page_token="def", ), spanner_instance_admin.ListInstancesResponse( - instances=[spanner_instance_admin.Instance(),], next_page_token="ghi", + instances=[ + spanner_instance_admin.Instance(), + ], + next_page_token="ghi", ), spanner_instance_admin.ListInstancesResponse( instances=[ @@ -1569,7 +1684,9 @@ def test_list_instances_pages(transport_name: str = "grpc"): @pytest.mark.asyncio async def test_list_instances_async_pager(): - client = InstanceAdminAsyncClient(credentials=ga_credentials.AnonymousCredentials,) + client = InstanceAdminAsyncClient( + credentials=ga_credentials.AnonymousCredentials, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -1586,10 +1703,14 @@ async def test_list_instances_async_pager(): next_page_token="abc", ), spanner_instance_admin.ListInstancesResponse( - instances=[], next_page_token="def", + instances=[], + next_page_token="def", ), spanner_instance_admin.ListInstancesResponse( - instances=[spanner_instance_admin.Instance(),], next_page_token="ghi", + instances=[ + spanner_instance_admin.Instance(), + ], + next_page_token="ghi", ), spanner_instance_admin.ListInstancesResponse( instances=[ @@ -1599,7 +1720,9 @@ async def test_list_instances_async_pager(): ), RuntimeError, ) - async_pager = await client.list_instances(request={},) + async_pager = await client.list_instances( + request={}, + ) assert async_pager.next_page_token == "abc" responses = [] async for response in async_pager: @@ -1611,7 +1734,9 @@ async def test_list_instances_async_pager(): @pytest.mark.asyncio async def test_list_instances_async_pages(): - client = InstanceAdminAsyncClient(credentials=ga_credentials.AnonymousCredentials,) + client = InstanceAdminAsyncClient( + credentials=ga_credentials.AnonymousCredentials, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -1628,10 +1753,14 @@ async def test_list_instances_async_pages(): next_page_token="abc", ), spanner_instance_admin.ListInstancesResponse( - instances=[], next_page_token="def", + instances=[], + next_page_token="def", ), spanner_instance_admin.ListInstancesResponse( - instances=[spanner_instance_admin.Instance(),], next_page_token="ghi", + instances=[ + spanner_instance_admin.Instance(), + ], + next_page_token="ghi", ), spanner_instance_admin.ListInstancesResponse( instances=[ @@ -1649,11 +1778,16 @@ async def test_list_instances_async_pages(): @pytest.mark.parametrize( - "request_type", [spanner_instance_admin.GetInstanceRequest, dict,] + "request_type", + [ + spanner_instance_admin.GetInstanceRequest, + dict, + ], ) def test_get_instance(request_type, transport: str = "grpc"): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1694,7 +1828,8 @@ def test_get_instance_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1711,7 +1846,8 @@ async def test_get_instance_async( request_type=spanner_instance_admin.GetInstanceRequest, ): client = InstanceAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1756,7 +1892,9 @@ async def test_get_instance_async_from_dict(): def test_get_instance_field_headers(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1776,7 +1914,10 @@ def test_get_instance_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -1805,11 +1946,16 @@ async def test_get_instance_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] def test_get_instance_flattened(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.get_instance), "__call__") as call: @@ -1817,7 +1963,9 @@ def test_get_instance_flattened(): call.return_value = spanner_instance_admin.Instance() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.get_instance(name="name_value",) + client.get_instance( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1829,13 +1977,16 @@ def test_get_instance_flattened(): def test_get_instance_flattened_error(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.get_instance( - spanner_instance_admin.GetInstanceRequest(), name="name_value", + spanner_instance_admin.GetInstanceRequest(), + name="name_value", ) @@ -1855,7 +2006,9 @@ async def test_get_instance_flattened_async(): ) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.get_instance(name="name_value",) + response = await client.get_instance( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1876,16 +2029,22 @@ async def test_get_instance_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.get_instance( - spanner_instance_admin.GetInstanceRequest(), name="name_value", + spanner_instance_admin.GetInstanceRequest(), + name="name_value", ) @pytest.mark.parametrize( - "request_type", [spanner_instance_admin.CreateInstanceRequest, dict,] + "request_type", + [ + spanner_instance_admin.CreateInstanceRequest, + dict, + ], ) def test_create_instance(request_type, transport: str = "grpc"): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1911,7 +2070,8 @@ def test_create_instance_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1928,7 +2088,8 @@ async def test_create_instance_async( request_type=spanner_instance_admin.CreateInstanceRequest, ): client = InstanceAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1958,7 +2119,9 @@ async def test_create_instance_async_from_dict(): def test_create_instance_field_headers(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1978,7 +2141,10 @@ def test_create_instance_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -2007,11 +2173,16 @@ async def test_create_instance_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "parent=parent/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "parent=parent/value", + ) in kw["metadata"] def test_create_instance_flattened(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.create_instance), "__call__") as call: @@ -2041,7 +2212,9 @@ def test_create_instance_flattened(): def test_create_instance_flattened_error(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -2109,11 +2282,16 @@ async def test_create_instance_flattened_error_async(): @pytest.mark.parametrize( - "request_type", [spanner_instance_admin.UpdateInstanceRequest, dict,] + "request_type", + [ + spanner_instance_admin.UpdateInstanceRequest, + dict, + ], ) def test_update_instance(request_type, transport: str = "grpc"): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2139,7 +2317,8 @@ def test_update_instance_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -2156,7 +2335,8 @@ async def test_update_instance_async( request_type=spanner_instance_admin.UpdateInstanceRequest, ): client = InstanceAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2186,7 +2366,9 @@ async def test_update_instance_async_from_dict(): def test_update_instance_field_headers(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2206,9 +2388,10 @@ def test_update_instance_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "instance.name=instance.name/value",) in kw[ - "metadata" - ] + assert ( + "x-goog-request-params", + "instance.name=instance.name/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -2237,13 +2420,16 @@ async def test_update_instance_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "instance.name=instance.name/value",) in kw[ - "metadata" - ] + assert ( + "x-goog-request-params", + "instance.name=instance.name/value", + ) in kw["metadata"] def test_update_instance_flattened(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.update_instance), "__call__") as call: @@ -2269,7 +2455,9 @@ def test_update_instance_flattened(): def test_update_instance_flattened_error(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -2331,11 +2519,16 @@ async def test_update_instance_flattened_error_async(): @pytest.mark.parametrize( - "request_type", [spanner_instance_admin.DeleteInstanceRequest, dict,] + "request_type", + [ + spanner_instance_admin.DeleteInstanceRequest, + dict, + ], ) def test_delete_instance(request_type, transport: str = "grpc"): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2361,7 +2554,8 @@ def test_delete_instance_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -2378,7 +2572,8 @@ async def test_delete_instance_async( request_type=spanner_instance_admin.DeleteInstanceRequest, ): client = InstanceAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2406,7 +2601,9 @@ async def test_delete_instance_async_from_dict(): def test_delete_instance_field_headers(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2426,7 +2623,10 @@ def test_delete_instance_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -2453,11 +2653,16 @@ async def test_delete_instance_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] def test_delete_instance_flattened(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.delete_instance), "__call__") as call: @@ -2465,7 +2670,9 @@ def test_delete_instance_flattened(): call.return_value = None # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.delete_instance(name="name_value",) + client.delete_instance( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -2477,13 +2684,16 @@ def test_delete_instance_flattened(): def test_delete_instance_flattened_error(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.delete_instance( - spanner_instance_admin.DeleteInstanceRequest(), name="name_value", + spanner_instance_admin.DeleteInstanceRequest(), + name="name_value", ) @@ -2501,7 +2711,9 @@ async def test_delete_instance_flattened_async(): call.return_value = grpc_helpers_async.FakeUnaryUnaryCall(None) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.delete_instance(name="name_value",) + response = await client.delete_instance( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -2522,14 +2734,22 @@ async def test_delete_instance_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.delete_instance( - spanner_instance_admin.DeleteInstanceRequest(), name="name_value", + spanner_instance_admin.DeleteInstanceRequest(), + name="name_value", ) -@pytest.mark.parametrize("request_type", [iam_policy_pb2.SetIamPolicyRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + iam_policy_pb2.SetIamPolicyRequest, + dict, + ], +) def test_set_iam_policy(request_type, transport: str = "grpc"): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2539,7 +2759,10 @@ def test_set_iam_policy(request_type, transport: str = "grpc"): # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.set_iam_policy), "__call__") as call: # Designate an appropriate return value for the call. - call.return_value = policy_pb2.Policy(version=774, etag=b"etag_blob",) + call.return_value = policy_pb2.Policy( + version=774, + etag=b"etag_blob", + ) response = client.set_iam_policy(request) # Establish that the underlying gRPC stub method was called. @@ -2557,7 +2780,8 @@ def test_set_iam_policy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -2573,7 +2797,8 @@ async def test_set_iam_policy_async( transport: str = "grpc_asyncio", request_type=iam_policy_pb2.SetIamPolicyRequest ): client = InstanceAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2584,7 +2809,10 @@ async def test_set_iam_policy_async( with mock.patch.object(type(client.transport.set_iam_policy), "__call__") as call: # Designate an appropriate return value for the call. call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( - policy_pb2.Policy(version=774, etag=b"etag_blob",) + policy_pb2.Policy( + version=774, + etag=b"etag_blob", + ) ) response = await client.set_iam_policy(request) @@ -2605,7 +2833,9 @@ async def test_set_iam_policy_async_from_dict(): def test_set_iam_policy_field_headers(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2625,7 +2855,10 @@ def test_set_iam_policy_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "resource=resource/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "resource=resource/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -2652,11 +2885,16 @@ async def test_set_iam_policy_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "resource=resource/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "resource=resource/value", + ) in kw["metadata"] def test_set_iam_policy_from_dict_foreign(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.set_iam_policy), "__call__") as call: # Designate an appropriate return value for the call. @@ -2671,7 +2909,9 @@ def test_set_iam_policy_from_dict_foreign(): def test_set_iam_policy_flattened(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.set_iam_policy), "__call__") as call: @@ -2679,7 +2919,9 @@ def test_set_iam_policy_flattened(): call.return_value = policy_pb2.Policy() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.set_iam_policy(resource="resource_value",) + client.set_iam_policy( + resource="resource_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -2691,13 +2933,16 @@ def test_set_iam_policy_flattened(): def test_set_iam_policy_flattened_error(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.set_iam_policy( - iam_policy_pb2.SetIamPolicyRequest(), resource="resource_value", + iam_policy_pb2.SetIamPolicyRequest(), + resource="resource_value", ) @@ -2715,7 +2960,9 @@ async def test_set_iam_policy_flattened_async(): call.return_value = grpc_helpers_async.FakeUnaryUnaryCall(policy_pb2.Policy()) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.set_iam_policy(resource="resource_value",) + response = await client.set_iam_policy( + resource="resource_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -2736,14 +2983,22 @@ async def test_set_iam_policy_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.set_iam_policy( - iam_policy_pb2.SetIamPolicyRequest(), resource="resource_value", + iam_policy_pb2.SetIamPolicyRequest(), + resource="resource_value", ) -@pytest.mark.parametrize("request_type", [iam_policy_pb2.GetIamPolicyRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + iam_policy_pb2.GetIamPolicyRequest, + dict, + ], +) def test_get_iam_policy(request_type, transport: str = "grpc"): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2753,7 +3008,10 @@ def test_get_iam_policy(request_type, transport: str = "grpc"): # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.get_iam_policy), "__call__") as call: # Designate an appropriate return value for the call. - call.return_value = policy_pb2.Policy(version=774, etag=b"etag_blob",) + call.return_value = policy_pb2.Policy( + version=774, + etag=b"etag_blob", + ) response = client.get_iam_policy(request) # Establish that the underlying gRPC stub method was called. @@ -2771,7 +3029,8 @@ def test_get_iam_policy_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -2787,7 +3046,8 @@ async def test_get_iam_policy_async( transport: str = "grpc_asyncio", request_type=iam_policy_pb2.GetIamPolicyRequest ): client = InstanceAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2798,7 +3058,10 @@ async def test_get_iam_policy_async( with mock.patch.object(type(client.transport.get_iam_policy), "__call__") as call: # Designate an appropriate return value for the call. call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( - policy_pb2.Policy(version=774, etag=b"etag_blob",) + policy_pb2.Policy( + version=774, + etag=b"etag_blob", + ) ) response = await client.get_iam_policy(request) @@ -2819,7 +3082,9 @@ async def test_get_iam_policy_async_from_dict(): def test_get_iam_policy_field_headers(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2839,7 +3104,10 @@ def test_get_iam_policy_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "resource=resource/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "resource=resource/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -2866,11 +3134,16 @@ async def test_get_iam_policy_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "resource=resource/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "resource=resource/value", + ) in kw["metadata"] def test_get_iam_policy_from_dict_foreign(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.get_iam_policy), "__call__") as call: # Designate an appropriate return value for the call. @@ -2885,7 +3158,9 @@ def test_get_iam_policy_from_dict_foreign(): def test_get_iam_policy_flattened(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.get_iam_policy), "__call__") as call: @@ -2893,7 +3168,9 @@ def test_get_iam_policy_flattened(): call.return_value = policy_pb2.Policy() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.get_iam_policy(resource="resource_value",) + client.get_iam_policy( + resource="resource_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -2905,13 +3182,16 @@ def test_get_iam_policy_flattened(): def test_get_iam_policy_flattened_error(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.get_iam_policy( - iam_policy_pb2.GetIamPolicyRequest(), resource="resource_value", + iam_policy_pb2.GetIamPolicyRequest(), + resource="resource_value", ) @@ -2929,7 +3209,9 @@ async def test_get_iam_policy_flattened_async(): call.return_value = grpc_helpers_async.FakeUnaryUnaryCall(policy_pb2.Policy()) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.get_iam_policy(resource="resource_value",) + response = await client.get_iam_policy( + resource="resource_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -2950,16 +3232,22 @@ async def test_get_iam_policy_flattened_error_async(): # fields is an error. with pytest.raises(ValueError): await client.get_iam_policy( - iam_policy_pb2.GetIamPolicyRequest(), resource="resource_value", + iam_policy_pb2.GetIamPolicyRequest(), + resource="resource_value", ) @pytest.mark.parametrize( - "request_type", [iam_policy_pb2.TestIamPermissionsRequest, dict,] + "request_type", + [ + iam_policy_pb2.TestIamPermissionsRequest, + dict, + ], ) def test_test_iam_permissions(request_type, transport: str = "grpc"): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2990,7 +3278,8 @@ def test_test_iam_permissions_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -3009,7 +3298,8 @@ async def test_test_iam_permissions_async( request_type=iam_policy_pb2.TestIamPermissionsRequest, ): client = InstanceAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3044,7 +3334,9 @@ async def test_test_iam_permissions_async_from_dict(): def test_test_iam_permissions_field_headers(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -3066,7 +3358,10 @@ def test_test_iam_permissions_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "resource=resource/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "resource=resource/value", + ) in kw["metadata"] @pytest.mark.asyncio @@ -3097,11 +3392,16 @@ async def test_test_iam_permissions_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "resource=resource/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "resource=resource/value", + ) in kw["metadata"] def test_test_iam_permissions_from_dict_foreign(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( type(client.transport.test_iam_permissions), "__call__" @@ -3118,7 +3418,9 @@ def test_test_iam_permissions_from_dict_foreign(): def test_test_iam_permissions_flattened(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -3129,7 +3431,8 @@ def test_test_iam_permissions_flattened(): # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. client.test_iam_permissions( - resource="resource_value", permissions=["permissions_value"], + resource="resource_value", + permissions=["permissions_value"], ) # Establish that the underlying call was made with the expected @@ -3145,7 +3448,9 @@ def test_test_iam_permissions_flattened(): def test_test_iam_permissions_flattened_error(): - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -3176,7 +3481,8 @@ async def test_test_iam_permissions_flattened_async(): # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. response = await client.test_iam_permissions( - resource="resource_value", permissions=["permissions_value"], + resource="resource_value", + permissions=["permissions_value"], ) # Establish that the underlying call was made with the expected @@ -3214,7 +3520,8 @@ def test_credentials_transport_error(): ) with pytest.raises(ValueError): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # It is an error to provide a credentials file and a transport instance. @@ -3234,7 +3541,10 @@ def test_credentials_transport_error(): options = client_options.ClientOptions() options.api_key = "api_key" with pytest.raises(ValueError): - client = InstanceAdminClient(client_options=options, transport=transport,) + client = InstanceAdminClient( + client_options=options, + transport=transport, + ) # It is an error to provide an api_key and a credential. options = mock.Mock() @@ -3250,7 +3560,8 @@ def test_credentials_transport_error(): ) with pytest.raises(ValueError): client = InstanceAdminClient( - client_options={"scopes": ["1", "2"]}, transport=transport, + client_options={"scopes": ["1", "2"]}, + transport=transport, ) @@ -3295,8 +3606,13 @@ def test_transport_adc(transport_class): def test_transport_grpc_default(): # A client should use the gRPC transport by default. - client = InstanceAdminClient(credentials=ga_credentials.AnonymousCredentials(),) - assert isinstance(client.transport, transports.InstanceAdminGrpcTransport,) + client = InstanceAdminClient( + credentials=ga_credentials.AnonymousCredentials(), + ) + assert isinstance( + client.transport, + transports.InstanceAdminGrpcTransport, + ) def test_instance_admin_base_transport_error(): @@ -3355,7 +3671,8 @@ def test_instance_admin_base_transport_with_credentials_file(): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.InstanceAdminTransport( - credentials_file="credentials.json", quota_project_id="octopus", + credentials_file="credentials.json", + quota_project_id="octopus", ) load_creds.assert_called_once_with( "credentials.json", @@ -3525,7 +3842,8 @@ def test_instance_admin_grpc_transport_channel(): # Check that channel is used if provided. transport = transports.InstanceAdminGrpcTransport( - host="squid.clam.whelk", channel=channel, + host="squid.clam.whelk", + channel=channel, ) assert transport.grpc_channel == channel assert transport._host == "squid.clam.whelk:443" @@ -3537,7 +3855,8 @@ def test_instance_admin_grpc_asyncio_transport_channel(): # Check that channel is used if provided. transport = transports.InstanceAdminGrpcAsyncIOTransport( - host="squid.clam.whelk", channel=channel, + host="squid.clam.whelk", + channel=channel, ) assert transport.grpc_channel == channel assert transport._host == "squid.clam.whelk:443" @@ -3644,12 +3963,16 @@ def test_instance_admin_transport_channel_mtls_with_adc(transport_class): def test_instance_admin_grpc_lro_client(): client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) transport = client.transport # Ensure that we have a api-core operations client. - assert isinstance(transport.operations_client, operations_v1.OperationsClient,) + assert isinstance( + transport.operations_client, + operations_v1.OperationsClient, + ) # Ensure that subsequent calls to the property send the exact same object. assert transport.operations_client is transport.operations_client @@ -3657,12 +3980,16 @@ def test_instance_admin_grpc_lro_client(): def test_instance_admin_grpc_lro_async_client(): client = InstanceAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc_asyncio", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc_asyncio", ) transport = client.transport # Ensure that we have a api-core operations client. - assert isinstance(transport.operations_client, operations_v1.OperationsAsyncClient,) + assert isinstance( + transport.operations_client, + operations_v1.OperationsAsyncClient, + ) # Ensure that subsequent calls to the property send the exact same object. assert transport.operations_client is transport.operations_client @@ -3672,7 +3999,8 @@ def test_instance_path(): project = "squid" instance = "clam" expected = "projects/{project}/instances/{instance}".format( - project=project, instance=instance, + project=project, + instance=instance, ) actual = InstanceAdminClient.instance_path(project, instance) assert expected == actual @@ -3694,7 +4022,8 @@ def test_instance_config_path(): project = "oyster" instance_config = "nudibranch" expected = "projects/{project}/instanceConfigs/{instance_config}".format( - project=project, instance_config=instance_config, + project=project, + instance_config=instance_config, ) actual = InstanceAdminClient.instance_config_path(project, instance_config) assert expected == actual @@ -3734,7 +4063,9 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): folder = "scallop" - expected = "folders/{folder}".format(folder=folder,) + expected = "folders/{folder}".format( + folder=folder, + ) actual = InstanceAdminClient.common_folder_path(folder) assert expected == actual @@ -3752,7 +4083,9 @@ def test_parse_common_folder_path(): def test_common_organization_path(): organization = "squid" - expected = "organizations/{organization}".format(organization=organization,) + expected = "organizations/{organization}".format( + organization=organization, + ) actual = InstanceAdminClient.common_organization_path(organization) assert expected == actual @@ -3770,7 +4103,9 @@ def test_parse_common_organization_path(): def test_common_project_path(): project = "whelk" - expected = "projects/{project}".format(project=project,) + expected = "projects/{project}".format( + project=project, + ) actual = InstanceAdminClient.common_project_path(project) assert expected == actual @@ -3790,7 +4125,8 @@ def test_common_location_path(): project = "oyster" location = "nudibranch" expected = "projects/{project}/locations/{location}".format( - project=project, location=location, + project=project, + location=location, ) actual = InstanceAdminClient.common_location_path(project, location) assert expected == actual @@ -3815,7 +4151,8 @@ def test_client_with_default_client_info(): transports.InstanceAdminTransport, "_prep_wrapped_messages" ) as prep: client = InstanceAdminClient( - credentials=ga_credentials.AnonymousCredentials(), client_info=client_info, + credentials=ga_credentials.AnonymousCredentials(), + client_info=client_info, ) prep.assert_called_once_with(client_info) @@ -3824,7 +4161,8 @@ def test_client_with_default_client_info(): ) as prep: transport_class = InstanceAdminClient.get_transport_class() transport = transport_class( - credentials=ga_credentials.AnonymousCredentials(), client_info=client_info, + credentials=ga_credentials.AnonymousCredentials(), + client_info=client_info, ) prep.assert_called_once_with(client_info) @@ -3832,7 +4170,8 @@ def test_client_with_default_client_info(): @pytest.mark.asyncio async def test_transport_close_async(): client = InstanceAdminAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc_asyncio", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc_asyncio", ) with mock.patch.object( type(getattr(client.transport, "grpc_channel")), "close" diff --git a/tests/unit/gapic/spanner_v1/test_spanner.py b/tests/unit/gapic/spanner_v1/test_spanner.py index c207dc5fbc..f0c0f0bafc 100644 --- a/tests/unit/gapic/spanner_v1/test_spanner.py +++ b/tests/unit/gapic/spanner_v1/test_spanner.py @@ -88,7 +88,13 @@ def test__get_default_mtls_endpoint(): assert SpannerClient._get_default_mtls_endpoint(non_googleapi) == non_googleapi -@pytest.mark.parametrize("client_class", [SpannerClient, SpannerAsyncClient,]) +@pytest.mark.parametrize( + "client_class", + [ + SpannerClient, + SpannerAsyncClient, + ], +) def test_spanner_client_from_service_account_info(client_class): creds = ga_credentials.AnonymousCredentials() with mock.patch.object( @@ -126,7 +132,13 @@ def test_spanner_client_service_account_always_use_jwt(transport_class, transpor use_jwt.assert_not_called() -@pytest.mark.parametrize("client_class", [SpannerClient, SpannerAsyncClient,]) +@pytest.mark.parametrize( + "client_class", + [ + SpannerClient, + SpannerAsyncClient, + ], +) def test_spanner_client_from_service_account_file(client_class): creds = ga_credentials.AnonymousCredentials() with mock.patch.object( @@ -465,7 +477,9 @@ def test_spanner_client_client_options_scopes( client_class, transport_class, transport_name ): # Check the case scopes are provided. - options = client_options.ClientOptions(scopes=["1", "2"],) + options = client_options.ClientOptions( + scopes=["1", "2"], + ) with mock.patch.object(transport_class, "__init__") as patched: patched.return_value = None client = client_class(client_options=options, transport=transport_name) @@ -596,10 +610,17 @@ def test_spanner_client_create_channel_credentials_file( ) -@pytest.mark.parametrize("request_type", [spanner.CreateSessionRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.CreateSessionRequest, + dict, + ], +) def test_create_session(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -609,7 +630,9 @@ def test_create_session(request_type, transport: str = "grpc"): # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.create_session), "__call__") as call: # Designate an appropriate return value for the call. - call.return_value = spanner.Session(name="name_value",) + call.return_value = spanner.Session( + name="name_value", + ) response = client.create_session(request) # Establish that the underlying gRPC stub method was called. @@ -626,7 +649,8 @@ def test_create_session_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -642,7 +666,8 @@ async def test_create_session_async( transport: str = "grpc_asyncio", request_type=spanner.CreateSessionRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -653,7 +678,9 @@ async def test_create_session_async( with mock.patch.object(type(client.transport.create_session), "__call__") as call: # Designate an appropriate return value for the call. call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( - spanner.Session(name="name_value",) + spanner.Session( + name="name_value", + ) ) response = await client.create_session(request) @@ -673,7 +700,9 @@ async def test_create_session_async_from_dict(): def test_create_session_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -693,12 +722,17 @@ def test_create_session_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "database=database/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "database=database/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_create_session_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -718,11 +752,16 @@ async def test_create_session_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "database=database/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "database=database/value", + ) in kw["metadata"] def test_create_session_flattened(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.create_session), "__call__") as call: @@ -730,7 +769,9 @@ def test_create_session_flattened(): call.return_value = spanner.Session() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.create_session(database="database_value",) + client.create_session( + database="database_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -742,19 +783,24 @@ def test_create_session_flattened(): def test_create_session_flattened_error(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.create_session( - spanner.CreateSessionRequest(), database="database_value", + spanner.CreateSessionRequest(), + database="database_value", ) @pytest.mark.asyncio async def test_create_session_flattened_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.create_session), "__call__") as call: @@ -764,7 +810,9 @@ async def test_create_session_flattened_async(): call.return_value = grpc_helpers_async.FakeUnaryUnaryCall(spanner.Session()) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.create_session(database="database_value",) + response = await client.create_session( + database="database_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -777,20 +825,30 @@ async def test_create_session_flattened_async(): @pytest.mark.asyncio async def test_create_session_flattened_error_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): await client.create_session( - spanner.CreateSessionRequest(), database="database_value", + spanner.CreateSessionRequest(), + database="database_value", ) -@pytest.mark.parametrize("request_type", [spanner.BatchCreateSessionsRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.BatchCreateSessionsRequest, + dict, + ], +) def test_batch_create_sessions(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -818,7 +876,8 @@ def test_batch_create_sessions_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -836,7 +895,8 @@ async def test_batch_create_sessions_async( transport: str = "grpc_asyncio", request_type=spanner.BatchCreateSessionsRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -868,7 +928,9 @@ async def test_batch_create_sessions_async_from_dict(): def test_batch_create_sessions_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -890,12 +952,17 @@ def test_batch_create_sessions_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "database=database/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "database=database/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_batch_create_sessions_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -919,11 +986,16 @@ async def test_batch_create_sessions_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "database=database/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "database=database/value", + ) in kw["metadata"] def test_batch_create_sessions_flattened(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -934,7 +1006,8 @@ def test_batch_create_sessions_flattened(): # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. client.batch_create_sessions( - database="database_value", session_count=1420, + database="database_value", + session_count=1420, ) # Establish that the underlying call was made with the expected @@ -950,7 +1023,9 @@ def test_batch_create_sessions_flattened(): def test_batch_create_sessions_flattened_error(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -964,7 +1039,9 @@ def test_batch_create_sessions_flattened_error(): @pytest.mark.asyncio async def test_batch_create_sessions_flattened_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -979,7 +1056,8 @@ async def test_batch_create_sessions_flattened_async(): # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. response = await client.batch_create_sessions( - database="database_value", session_count=1420, + database="database_value", + session_count=1420, ) # Establish that the underlying call was made with the expected @@ -996,7 +1074,9 @@ async def test_batch_create_sessions_flattened_async(): @pytest.mark.asyncio async def test_batch_create_sessions_flattened_error_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -1008,10 +1088,17 @@ async def test_batch_create_sessions_flattened_error_async(): ) -@pytest.mark.parametrize("request_type", [spanner.GetSessionRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.GetSessionRequest, + dict, + ], +) def test_get_session(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1021,7 +1108,9 @@ def test_get_session(request_type, transport: str = "grpc"): # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.get_session), "__call__") as call: # Designate an appropriate return value for the call. - call.return_value = spanner.Session(name="name_value",) + call.return_value = spanner.Session( + name="name_value", + ) response = client.get_session(request) # Establish that the underlying gRPC stub method was called. @@ -1038,7 +1127,8 @@ def test_get_session_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1054,7 +1144,8 @@ async def test_get_session_async( transport: str = "grpc_asyncio", request_type=spanner.GetSessionRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1065,7 +1156,9 @@ async def test_get_session_async( with mock.patch.object(type(client.transport.get_session), "__call__") as call: # Designate an appropriate return value for the call. call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( - spanner.Session(name="name_value",) + spanner.Session( + name="name_value", + ) ) response = await client.get_session(request) @@ -1085,7 +1178,9 @@ async def test_get_session_async_from_dict(): def test_get_session_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1105,12 +1200,17 @@ def test_get_session_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_get_session_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1130,11 +1230,16 @@ async def test_get_session_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] def test_get_session_flattened(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.get_session), "__call__") as call: @@ -1142,7 +1247,9 @@ def test_get_session_flattened(): call.return_value = spanner.Session() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.get_session(name="name_value",) + client.get_session( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1154,19 +1261,24 @@ def test_get_session_flattened(): def test_get_session_flattened_error(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.get_session( - spanner.GetSessionRequest(), name="name_value", + spanner.GetSessionRequest(), + name="name_value", ) @pytest.mark.asyncio async def test_get_session_flattened_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.get_session), "__call__") as call: @@ -1176,7 +1288,9 @@ async def test_get_session_flattened_async(): call.return_value = grpc_helpers_async.FakeUnaryUnaryCall(spanner.Session()) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.get_session(name="name_value",) + response = await client.get_session( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1189,20 +1303,30 @@ async def test_get_session_flattened_async(): @pytest.mark.asyncio async def test_get_session_flattened_error_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): await client.get_session( - spanner.GetSessionRequest(), name="name_value", + spanner.GetSessionRequest(), + name="name_value", ) -@pytest.mark.parametrize("request_type", [spanner.ListSessionsRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.ListSessionsRequest, + dict, + ], +) def test_list_sessions(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1231,7 +1355,8 @@ def test_list_sessions_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1247,7 +1372,8 @@ async def test_list_sessions_async( transport: str = "grpc_asyncio", request_type=spanner.ListSessionsRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1258,7 +1384,9 @@ async def test_list_sessions_async( with mock.patch.object(type(client.transport.list_sessions), "__call__") as call: # Designate an appropriate return value for the call. call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( - spanner.ListSessionsResponse(next_page_token="next_page_token_value",) + spanner.ListSessionsResponse( + next_page_token="next_page_token_value", + ) ) response = await client.list_sessions(request) @@ -1278,7 +1406,9 @@ async def test_list_sessions_async_from_dict(): def test_list_sessions_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1298,12 +1428,17 @@ def test_list_sessions_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "database=database/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "database=database/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_list_sessions_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1325,11 +1460,16 @@ async def test_list_sessions_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "database=database/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "database=database/value", + ) in kw["metadata"] def test_list_sessions_flattened(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_sessions), "__call__") as call: @@ -1337,7 +1477,9 @@ def test_list_sessions_flattened(): call.return_value = spanner.ListSessionsResponse() # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.list_sessions(database="database_value",) + client.list_sessions( + database="database_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1349,19 +1491,24 @@ def test_list_sessions_flattened(): def test_list_sessions_flattened_error(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.list_sessions( - spanner.ListSessionsRequest(), database="database_value", + spanner.ListSessionsRequest(), + database="database_value", ) @pytest.mark.asyncio async def test_list_sessions_flattened_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.list_sessions), "__call__") as call: @@ -1373,7 +1520,9 @@ async def test_list_sessions_flattened_async(): ) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.list_sessions(database="database_value",) + response = await client.list_sessions( + database="database_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1386,19 +1535,23 @@ async def test_list_sessions_flattened_async(): @pytest.mark.asyncio async def test_list_sessions_flattened_error_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): await client.list_sessions( - spanner.ListSessionsRequest(), database="database_value", + spanner.ListSessionsRequest(), + database="database_value", ) def test_list_sessions_pager(transport_name: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + credentials=ga_credentials.AnonymousCredentials, + transport=transport_name, ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1406,15 +1559,28 @@ def test_list_sessions_pager(transport_name: str = "grpc"): # Set the response to a series of pages. call.side_effect = ( spanner.ListSessionsResponse( - sessions=[spanner.Session(), spanner.Session(), spanner.Session(),], + sessions=[ + spanner.Session(), + spanner.Session(), + spanner.Session(), + ], next_page_token="abc", ), - spanner.ListSessionsResponse(sessions=[], next_page_token="def",), spanner.ListSessionsResponse( - sessions=[spanner.Session(),], next_page_token="ghi", + sessions=[], + next_page_token="def", ), spanner.ListSessionsResponse( - sessions=[spanner.Session(), spanner.Session(),], + sessions=[ + spanner.Session(), + ], + next_page_token="ghi", + ), + spanner.ListSessionsResponse( + sessions=[ + spanner.Session(), + spanner.Session(), + ], ), RuntimeError, ) @@ -1434,7 +1600,8 @@ def test_list_sessions_pager(transport_name: str = "grpc"): def test_list_sessions_pages(transport_name: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials, transport=transport_name, + credentials=ga_credentials.AnonymousCredentials, + transport=transport_name, ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1442,15 +1609,28 @@ def test_list_sessions_pages(transport_name: str = "grpc"): # Set the response to a series of pages. call.side_effect = ( spanner.ListSessionsResponse( - sessions=[spanner.Session(), spanner.Session(), spanner.Session(),], + sessions=[ + spanner.Session(), + spanner.Session(), + spanner.Session(), + ], next_page_token="abc", ), - spanner.ListSessionsResponse(sessions=[], next_page_token="def",), spanner.ListSessionsResponse( - sessions=[spanner.Session(),], next_page_token="ghi", + sessions=[], + next_page_token="def", ), spanner.ListSessionsResponse( - sessions=[spanner.Session(), spanner.Session(),], + sessions=[ + spanner.Session(), + ], + next_page_token="ghi", + ), + spanner.ListSessionsResponse( + sessions=[ + spanner.Session(), + spanner.Session(), + ], ), RuntimeError, ) @@ -1461,7 +1641,9 @@ def test_list_sessions_pages(transport_name: str = "grpc"): @pytest.mark.asyncio async def test_list_sessions_async_pager(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials,) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -1470,19 +1652,34 @@ async def test_list_sessions_async_pager(): # Set the response to a series of pages. call.side_effect = ( spanner.ListSessionsResponse( - sessions=[spanner.Session(), spanner.Session(), spanner.Session(),], + sessions=[ + spanner.Session(), + spanner.Session(), + spanner.Session(), + ], next_page_token="abc", ), - spanner.ListSessionsResponse(sessions=[], next_page_token="def",), spanner.ListSessionsResponse( - sessions=[spanner.Session(),], next_page_token="ghi", + sessions=[], + next_page_token="def", ), spanner.ListSessionsResponse( - sessions=[spanner.Session(), spanner.Session(),], + sessions=[ + spanner.Session(), + ], + next_page_token="ghi", + ), + spanner.ListSessionsResponse( + sessions=[ + spanner.Session(), + spanner.Session(), + ], ), RuntimeError, ) - async_pager = await client.list_sessions(request={},) + async_pager = await client.list_sessions( + request={}, + ) assert async_pager.next_page_token == "abc" responses = [] async for response in async_pager: @@ -1494,7 +1691,9 @@ async def test_list_sessions_async_pager(): @pytest.mark.asyncio async def test_list_sessions_async_pages(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials,) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials, + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -1503,15 +1702,28 @@ async def test_list_sessions_async_pages(): # Set the response to a series of pages. call.side_effect = ( spanner.ListSessionsResponse( - sessions=[spanner.Session(), spanner.Session(), spanner.Session(),], + sessions=[ + spanner.Session(), + spanner.Session(), + spanner.Session(), + ], next_page_token="abc", ), - spanner.ListSessionsResponse(sessions=[], next_page_token="def",), spanner.ListSessionsResponse( - sessions=[spanner.Session(),], next_page_token="ghi", + sessions=[], + next_page_token="def", + ), + spanner.ListSessionsResponse( + sessions=[ + spanner.Session(), + ], + next_page_token="ghi", ), spanner.ListSessionsResponse( - sessions=[spanner.Session(), spanner.Session(),], + sessions=[ + spanner.Session(), + spanner.Session(), + ], ), RuntimeError, ) @@ -1522,10 +1734,17 @@ async def test_list_sessions_async_pages(): assert page_.raw_page.next_page_token == token -@pytest.mark.parametrize("request_type", [spanner.DeleteSessionRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.DeleteSessionRequest, + dict, + ], +) def test_delete_session(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1551,7 +1770,8 @@ def test_delete_session_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1567,7 +1787,8 @@ async def test_delete_session_async( transport: str = "grpc_asyncio", request_type=spanner.DeleteSessionRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1595,7 +1816,9 @@ async def test_delete_session_async_from_dict(): def test_delete_session_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1615,12 +1838,17 @@ def test_delete_session_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_delete_session_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1640,11 +1868,16 @@ async def test_delete_session_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "name=name/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "name=name/value", + ) in kw["metadata"] def test_delete_session_flattened(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.delete_session), "__call__") as call: @@ -1652,7 +1885,9 @@ def test_delete_session_flattened(): call.return_value = None # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - client.delete_session(name="name_value",) + client.delete_session( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1664,19 +1899,24 @@ def test_delete_session_flattened(): def test_delete_session_flattened_error(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): client.delete_session( - spanner.DeleteSessionRequest(), name="name_value", + spanner.DeleteSessionRequest(), + name="name_value", ) @pytest.mark.asyncio async def test_delete_session_flattened_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.delete_session), "__call__") as call: @@ -1686,7 +1926,9 @@ async def test_delete_session_flattened_async(): call.return_value = grpc_helpers_async.FakeUnaryUnaryCall(None) # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. - response = await client.delete_session(name="name_value",) + response = await client.delete_session( + name="name_value", + ) # Establish that the underlying call was made with the expected # request object values. @@ -1699,20 +1941,30 @@ async def test_delete_session_flattened_async(): @pytest.mark.asyncio async def test_delete_session_flattened_error_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. with pytest.raises(ValueError): await client.delete_session( - spanner.DeleteSessionRequest(), name="name_value", + spanner.DeleteSessionRequest(), + name="name_value", ) -@pytest.mark.parametrize("request_type", [spanner.ExecuteSqlRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.ExecuteSqlRequest, + dict, + ], +) def test_execute_sql(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1738,7 +1990,8 @@ def test_execute_sql_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1754,7 +2007,8 @@ async def test_execute_sql_async( transport: str = "grpc_asyncio", request_type=spanner.ExecuteSqlRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1784,7 +2038,9 @@ async def test_execute_sql_async_from_dict(): def test_execute_sql_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1804,12 +2060,17 @@ def test_execute_sql_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_execute_sql_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1831,13 +2092,23 @@ async def test_execute_sql_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] -@pytest.mark.parametrize("request_type", [spanner.ExecuteSqlRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.ExecuteSqlRequest, + dict, + ], +) def test_execute_streaming_sql(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1866,7 +2137,8 @@ def test_execute_streaming_sql_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -1884,7 +2156,8 @@ async def test_execute_streaming_sql_async( transport: str = "grpc_asyncio", request_type=spanner.ExecuteSqlRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -1918,7 +2191,9 @@ async def test_execute_streaming_sql_async_from_dict(): def test_execute_streaming_sql_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1940,12 +2215,17 @@ def test_execute_streaming_sql_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_execute_streaming_sql_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -1970,13 +2250,23 @@ async def test_execute_streaming_sql_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] -@pytest.mark.parametrize("request_type", [spanner.ExecuteBatchDmlRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.ExecuteBatchDmlRequest, + dict, + ], +) def test_execute_batch_dml(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2004,7 +2294,8 @@ def test_execute_batch_dml_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -2022,7 +2313,8 @@ async def test_execute_batch_dml_async( transport: str = "grpc_asyncio", request_type=spanner.ExecuteBatchDmlRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2054,7 +2346,9 @@ async def test_execute_batch_dml_async_from_dict(): def test_execute_batch_dml_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2076,12 +2370,17 @@ def test_execute_batch_dml_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_execute_batch_dml_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2105,13 +2404,23 @@ async def test_execute_batch_dml_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] -@pytest.mark.parametrize("request_type", [spanner.ReadRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.ReadRequest, + dict, + ], +) def test_read(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2137,7 +2446,8 @@ def test_read_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -2153,7 +2463,8 @@ async def test_read_async( transport: str = "grpc_asyncio", request_type=spanner.ReadRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2183,7 +2494,9 @@ async def test_read_async_from_dict(): def test_read_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2203,12 +2516,17 @@ def test_read_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_read_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2230,13 +2548,23 @@ async def test_read_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] -@pytest.mark.parametrize("request_type", [spanner.ReadRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.ReadRequest, + dict, + ], +) def test_streaming_read(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2263,7 +2591,8 @@ def test_streaming_read_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -2279,7 +2608,8 @@ async def test_streaming_read_async( transport: str = "grpc_asyncio", request_type=spanner.ReadRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2311,7 +2641,9 @@ async def test_streaming_read_async_from_dict(): def test_streaming_read_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2331,12 +2663,17 @@ def test_streaming_read_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_streaming_read_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2359,13 +2696,23 @@ async def test_streaming_read_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] -@pytest.mark.parametrize("request_type", [spanner.BeginTransactionRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.BeginTransactionRequest, + dict, + ], +) def test_begin_transaction(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2377,7 +2724,9 @@ def test_begin_transaction(request_type, transport: str = "grpc"): type(client.transport.begin_transaction), "__call__" ) as call: # Designate an appropriate return value for the call. - call.return_value = transaction.Transaction(id=b"id_blob",) + call.return_value = transaction.Transaction( + id=b"id_blob", + ) response = client.begin_transaction(request) # Establish that the underlying gRPC stub method was called. @@ -2394,7 +2743,8 @@ def test_begin_transaction_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -2412,7 +2762,8 @@ async def test_begin_transaction_async( transport: str = "grpc_asyncio", request_type=spanner.BeginTransactionRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2425,7 +2776,9 @@ async def test_begin_transaction_async( ) as call: # Designate an appropriate return value for the call. call.return_value = grpc_helpers_async.FakeUnaryUnaryCall( - transaction.Transaction(id=b"id_blob",) + transaction.Transaction( + id=b"id_blob", + ) ) response = await client.begin_transaction(request) @@ -2445,7 +2798,9 @@ async def test_begin_transaction_async_from_dict(): def test_begin_transaction_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2467,12 +2822,17 @@ def test_begin_transaction_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_begin_transaction_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2496,11 +2856,16 @@ async def test_begin_transaction_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] def test_begin_transaction_flattened(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -2528,7 +2893,9 @@ def test_begin_transaction_flattened(): def test_begin_transaction_flattened_error(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -2542,7 +2909,9 @@ def test_begin_transaction_flattened_error(): @pytest.mark.asyncio async def test_begin_transaction_flattened_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object( @@ -2575,7 +2944,9 @@ async def test_begin_transaction_flattened_async(): @pytest.mark.asyncio async def test_begin_transaction_flattened_error_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -2587,10 +2958,17 @@ async def test_begin_transaction_flattened_error_async(): ) -@pytest.mark.parametrize("request_type", [spanner.CommitRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.CommitRequest, + dict, + ], +) def test_commit(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2616,7 +2994,8 @@ def test_commit_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -2632,7 +3011,8 @@ async def test_commit_async( transport: str = "grpc_asyncio", request_type=spanner.CommitRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2662,7 +3042,9 @@ async def test_commit_async_from_dict(): def test_commit_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2682,12 +3064,17 @@ def test_commit_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_commit_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2709,11 +3096,16 @@ async def test_commit_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] def test_commit_flattened(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.commit), "__call__") as call: @@ -2748,7 +3140,9 @@ def test_commit_flattened(): def test_commit_flattened_error(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -2766,7 +3160,9 @@ def test_commit_flattened_error(): @pytest.mark.asyncio async def test_commit_flattened_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.commit), "__call__") as call: @@ -2806,7 +3202,9 @@ async def test_commit_flattened_async(): @pytest.mark.asyncio async def test_commit_flattened_error_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -2822,10 +3220,17 @@ async def test_commit_flattened_error_async(): ) -@pytest.mark.parametrize("request_type", [spanner.RollbackRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.RollbackRequest, + dict, + ], +) def test_rollback(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2851,7 +3256,8 @@ def test_rollback_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -2867,7 +3273,8 @@ async def test_rollback_async( transport: str = "grpc_asyncio", request_type=spanner.RollbackRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -2895,7 +3302,9 @@ async def test_rollback_async_from_dict(): def test_rollback_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2915,12 +3324,17 @@ def test_rollback_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_rollback_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -2940,11 +3354,16 @@ async def test_rollback_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] def test_rollback_flattened(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.rollback), "__call__") as call: @@ -2953,7 +3372,8 @@ def test_rollback_flattened(): # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. client.rollback( - session="session_value", transaction_id=b"transaction_id_blob", + session="session_value", + transaction_id=b"transaction_id_blob", ) # Establish that the underlying call was made with the expected @@ -2969,7 +3389,9 @@ def test_rollback_flattened(): def test_rollback_flattened_error(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -2983,7 +3405,9 @@ def test_rollback_flattened_error(): @pytest.mark.asyncio async def test_rollback_flattened_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Mock the actual call within the gRPC stub, and fake the request. with mock.patch.object(type(client.transport.rollback), "__call__") as call: @@ -2994,7 +3418,8 @@ async def test_rollback_flattened_async(): # Call the method with a truthy value for each flattened field, # using the keyword arguments to the method. response = await client.rollback( - session="session_value", transaction_id=b"transaction_id_blob", + session="session_value", + transaction_id=b"transaction_id_blob", ) # Establish that the underlying call was made with the expected @@ -3011,7 +3436,9 @@ async def test_rollback_flattened_async(): @pytest.mark.asyncio async def test_rollback_flattened_error_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Attempting to call a method with both a request object and flattened # fields is an error. @@ -3023,10 +3450,17 @@ async def test_rollback_flattened_error_async(): ) -@pytest.mark.parametrize("request_type", [spanner.PartitionQueryRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.PartitionQueryRequest, + dict, + ], +) def test_partition_query(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3052,7 +3486,8 @@ def test_partition_query_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -3068,7 +3503,8 @@ async def test_partition_query_async( transport: str = "grpc_asyncio", request_type=spanner.PartitionQueryRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3098,7 +3534,9 @@ async def test_partition_query_async_from_dict(): def test_partition_query_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -3118,12 +3556,17 @@ def test_partition_query_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_partition_query_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -3145,13 +3588,23 @@ async def test_partition_query_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] -@pytest.mark.parametrize("request_type", [spanner.PartitionReadRequest, dict,]) +@pytest.mark.parametrize( + "request_type", + [ + spanner.PartitionReadRequest, + dict, + ], +) def test_partition_read(request_type, transport: str = "grpc"): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3177,7 +3630,8 @@ def test_partition_read_empty_call(): # This test is a coverage failsafe to make sure that totally empty calls, # i.e. request == None and no flattened fields passed, work. client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc", ) # Mock the actual call within the gRPC stub, and fake the request. @@ -3193,7 +3647,8 @@ async def test_partition_read_async( transport: str = "grpc_asyncio", request_type=spanner.PartitionReadRequest ): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # Everything is optional in proto3 as far as the runtime is concerned, @@ -3223,7 +3678,9 @@ async def test_partition_read_async_from_dict(): def test_partition_read_field_headers(): - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -3243,12 +3700,17 @@ def test_partition_read_field_headers(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] @pytest.mark.asyncio async def test_partition_read_field_headers_async(): - client = SpannerAsyncClient(credentials=ga_credentials.AnonymousCredentials(),) + client = SpannerAsyncClient( + credentials=ga_credentials.AnonymousCredentials(), + ) # Any value that is part of the HTTP/1.1 URI should be sent as # a field header. Set these to a non-empty value. @@ -3270,7 +3732,10 @@ async def test_partition_read_field_headers_async(): # Establish that the field header was sent. _, _, kw = call.mock_calls[0] - assert ("x-goog-request-params", "session=session/value",) in kw["metadata"] + assert ( + "x-goog-request-params", + "session=session/value", + ) in kw["metadata"] def test_credentials_transport_error(): @@ -3280,7 +3745,8 @@ def test_credentials_transport_error(): ) with pytest.raises(ValueError): client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), transport=transport, + credentials=ga_credentials.AnonymousCredentials(), + transport=transport, ) # It is an error to provide a credentials file and a transport instance. @@ -3300,7 +3766,10 @@ def test_credentials_transport_error(): options = client_options.ClientOptions() options.api_key = "api_key" with pytest.raises(ValueError): - client = SpannerClient(client_options=options, transport=transport,) + client = SpannerClient( + client_options=options, + transport=transport, + ) # It is an error to provide an api_key and a credential. options = mock.Mock() @@ -3316,7 +3785,8 @@ def test_credentials_transport_error(): ) with pytest.raises(ValueError): client = SpannerClient( - client_options={"scopes": ["1", "2"]}, transport=transport, + client_options={"scopes": ["1", "2"]}, + transport=transport, ) @@ -3346,7 +3816,10 @@ def test_transport_get_channel(): @pytest.mark.parametrize( "transport_class", - [transports.SpannerGrpcTransport, transports.SpannerGrpcAsyncIOTransport,], + [ + transports.SpannerGrpcTransport, + transports.SpannerGrpcAsyncIOTransport, + ], ) def test_transport_adc(transport_class): # Test default credentials are used if not provided. @@ -3358,8 +3831,13 @@ def test_transport_adc(transport_class): def test_transport_grpc_default(): # A client should use the gRPC transport by default. - client = SpannerClient(credentials=ga_credentials.AnonymousCredentials(),) - assert isinstance(client.transport, transports.SpannerGrpcTransport,) + client = SpannerClient( + credentials=ga_credentials.AnonymousCredentials(), + ) + assert isinstance( + client.transport, + transports.SpannerGrpcTransport, + ) def test_spanner_base_transport_error(): @@ -3418,7 +3896,8 @@ def test_spanner_base_transport_with_credentials_file(): Transport.return_value = None load_creds.return_value = (ga_credentials.AnonymousCredentials(), None) transport = transports.SpannerTransport( - credentials_file="credentials.json", quota_project_id="octopus", + credentials_file="credentials.json", + quota_project_id="octopus", ) load_creds.assert_called_once_with( "credentials.json", @@ -3459,7 +3938,10 @@ def test_spanner_auth_adc(): @pytest.mark.parametrize( "transport_class", - [transports.SpannerGrpcTransport, transports.SpannerGrpcAsyncIOTransport,], + [ + transports.SpannerGrpcTransport, + transports.SpannerGrpcAsyncIOTransport, + ], ) def test_spanner_transport_auth_adc(transport_class): # If credentials and host are not provided, the transport class should use @@ -3582,7 +4064,8 @@ def test_spanner_grpc_transport_channel(): # Check that channel is used if provided. transport = transports.SpannerGrpcTransport( - host="squid.clam.whelk", channel=channel, + host="squid.clam.whelk", + channel=channel, ) assert transport.grpc_channel == channel assert transport._host == "squid.clam.whelk:443" @@ -3594,7 +4077,8 @@ def test_spanner_grpc_asyncio_transport_channel(): # Check that channel is used if provided. transport = transports.SpannerGrpcAsyncIOTransport( - host="squid.clam.whelk", channel=channel, + host="squid.clam.whelk", + channel=channel, ) assert transport.grpc_channel == channel assert transport._host == "squid.clam.whelk:443" @@ -3698,7 +4182,9 @@ def test_database_path(): instance = "clam" database = "whelk" expected = "projects/{project}/instances/{instance}/databases/{database}".format( - project=project, instance=instance, database=database, + project=project, + instance=instance, + database=database, ) actual = SpannerClient.database_path(project, instance, database) assert expected == actual @@ -3723,7 +4209,10 @@ def test_session_path(): database = "winkle" session = "nautilus" expected = "projects/{project}/instances/{instance}/databases/{database}/sessions/{session}".format( - project=project, instance=instance, database=database, session=session, + project=project, + instance=instance, + database=database, + session=session, ) actual = SpannerClient.session_path(project, instance, database, session) assert expected == actual @@ -3765,7 +4254,9 @@ def test_parse_common_billing_account_path(): def test_common_folder_path(): folder = "oyster" - expected = "folders/{folder}".format(folder=folder,) + expected = "folders/{folder}".format( + folder=folder, + ) actual = SpannerClient.common_folder_path(folder) assert expected == actual @@ -3783,7 +4274,9 @@ def test_parse_common_folder_path(): def test_common_organization_path(): organization = "cuttlefish" - expected = "organizations/{organization}".format(organization=organization,) + expected = "organizations/{organization}".format( + organization=organization, + ) actual = SpannerClient.common_organization_path(organization) assert expected == actual @@ -3801,7 +4294,9 @@ def test_parse_common_organization_path(): def test_common_project_path(): project = "winkle" - expected = "projects/{project}".format(project=project,) + expected = "projects/{project}".format( + project=project, + ) actual = SpannerClient.common_project_path(project) assert expected == actual @@ -3821,7 +4316,8 @@ def test_common_location_path(): project = "scallop" location = "abalone" expected = "projects/{project}/locations/{location}".format( - project=project, location=location, + project=project, + location=location, ) actual = SpannerClient.common_location_path(project, location) assert expected == actual @@ -3846,7 +4342,8 @@ def test_client_with_default_client_info(): transports.SpannerTransport, "_prep_wrapped_messages" ) as prep: client = SpannerClient( - credentials=ga_credentials.AnonymousCredentials(), client_info=client_info, + credentials=ga_credentials.AnonymousCredentials(), + client_info=client_info, ) prep.assert_called_once_with(client_info) @@ -3855,7 +4352,8 @@ def test_client_with_default_client_info(): ) as prep: transport_class = SpannerClient.get_transport_class() transport = transport_class( - credentials=ga_credentials.AnonymousCredentials(), client_info=client_info, + credentials=ga_credentials.AnonymousCredentials(), + client_info=client_info, ) prep.assert_called_once_with(client_info) @@ -3863,7 +4361,8 @@ def test_client_with_default_client_info(): @pytest.mark.asyncio async def test_transport_close_async(): client = SpannerAsyncClient( - credentials=ga_credentials.AnonymousCredentials(), transport="grpc_asyncio", + credentials=ga_credentials.AnonymousCredentials(), + transport="grpc_asyncio", ) with mock.patch.object( type(getattr(client.transport, "grpc_channel")), "close" diff --git a/tests/unit/spanner_dbapi/test_connect.py b/tests/unit/spanner_dbapi/test_connect.py index f4dfe28a96..948659d595 100644 --- a/tests/unit/spanner_dbapi/test_connect.py +++ b/tests/unit/spanner_dbapi/test_connect.py @@ -70,7 +70,12 @@ def test_w_explicit(self, mock_client): database = instance.database.return_value connection = connect( - INSTANCE, DATABASE, PROJECT, credentials, pool=pool, user_agent=USER_AGENT, + INSTANCE, + DATABASE, + PROJECT, + credentials, + pool=pool, + user_agent=USER_AGENT, ) self.assertIsInstance(connection, Connection) @@ -107,7 +112,9 @@ def test_w_credential_file_path(self, mock_client): factory = mock_client.from_service_account_json factory.assert_called_once_with( - credentials_path, project=PROJECT, client_info=mock.ANY, + credentials_path, + project=PROJECT, + client_info=mock.ANY, ) client_info = factory.call_args_list[0][1]["client_info"] self.assertEqual(client_info.user_agent, USER_AGENT) diff --git a/tests/unit/spanner_dbapi/test_connection.py b/tests/unit/spanner_dbapi/test_connection.py index 0eea3eaf5b..7902de6405 100644 --- a/tests/unit/spanner_dbapi/test_connection.py +++ b/tests/unit/spanner_dbapi/test_connection.py @@ -134,7 +134,11 @@ def test_read_only_not_retried(self): connection.retry_transaction = mock.Mock() cursor = connection.cursor() - cursor._itr = mock.Mock(__next__=mock.Mock(side_effect=Aborted("Aborted"),)) + cursor._itr = mock.Mock( + __next__=mock.Mock( + side_effect=Aborted("Aborted"), + ) + ) cursor.fetchone() cursor.fetchall() @@ -574,7 +578,10 @@ def test_retry_aborted_retry(self, mock_client): connection.retry_transaction() run_mock.assert_has_calls( - (mock.call(statement, retried=True), mock.call(statement, retried=True),) + ( + mock.call(statement, retried=True), + mock.call(statement, retried=True), + ) ) def test_retry_transaction_raise_max_internal_retries(self): @@ -631,7 +638,10 @@ def test_retry_aborted_retry_without_delay(self, mock_client): connection.retry_transaction() run_mock.assert_has_calls( - (mock.call(statement, retried=True), mock.call(statement, retried=True),) + ( + mock.call(statement, retried=True), + mock.call(statement, retried=True), + ) ) def test_retry_transaction_w_multiple_statement(self): diff --git a/tests/unit/spanner_dbapi/test_cursor.py b/tests/unit/spanner_dbapi/test_cursor.py index 51732bc1b0..71e4a96d6e 100644 --- a/tests/unit/spanner_dbapi/test_cursor.py +++ b/tests/unit/spanner_dbapi/test_cursor.py @@ -106,7 +106,9 @@ def test_do_execute_update(self): def run_helper(ret_value): transaction.execute_update.return_value = ret_value res = cursor._do_execute_update( - transaction=transaction, sql="SELECT * WHERE true", params={}, + transaction=transaction, + sql="SELECT * WHERE true", + params={}, ) return res diff --git a/tests/unit/spanner_dbapi/test_parse_utils.py b/tests/unit/spanner_dbapi/test_parse_utils.py index 994b02d615..b0f363299b 100644 --- a/tests/unit/spanner_dbapi/test_parse_utils.py +++ b/tests/unit/spanner_dbapi/test_parse_utils.py @@ -425,5 +425,6 @@ def test_insert_from_select(self): ARGS = [5, "data2", "data3"] self.assertEqual( - parse_insert(SQL, ARGS), {"sql_params_list": [(SQL, ARGS)]}, + parse_insert(SQL, ARGS), + {"sql_params_list": [(SQL, ARGS)]}, ) diff --git a/tests/unit/spanner_dbapi/test_parser.py b/tests/unit/spanner_dbapi/test_parser.py index 994d4966d3..dd99f6fa4b 100644 --- a/tests/unit/spanner_dbapi/test_parser.py +++ b/tests/unit/spanner_dbapi/test_parser.py @@ -172,7 +172,7 @@ def test_a_args_homogeneous(self): from google.cloud.spanner_dbapi.parser import a_args from google.cloud.spanner_dbapi.parser import terminal - a_obj = a_args([a_args([terminal(10 ** i)]) for i in range(10)]) + a_obj = a_args([a_args([terminal(10**i)]) for i in range(10)]) self.assertTrue(a_obj.homogenous()) a_obj = a_args([a_args([[object()]]) for _ in range(10)]) @@ -193,7 +193,7 @@ def test_values(self): from google.cloud.spanner_dbapi.parser import terminal from google.cloud.spanner_dbapi.parser import values - a_obj = a_args([a_args([terminal(10 ** i)]) for i in range(10)]) + a_obj = a_args([a_args([terminal(10**i)]) for i in range(10)]) self.assertEqual(str(values(a_obj)), "VALUES%s" % str(a_obj)) def test_expect(self): diff --git a/tests/unit/test__helpers.py b/tests/unit/test__helpers.py index f6d1539221..b18adfa6fe 100644 --- a/tests/unit/test__helpers.py +++ b/tests/unit/test__helpers.py @@ -113,7 +113,7 @@ def test_w_invalid_bytes(self): def test_w_explicit_unicode(self): from google.protobuf.struct_pb2 import Value - TEXT = u"TEXT" + TEXT = "TEXT" value_pb = self._callFUT(TEXT) self.assertIsInstance(value_pb, Value) self.assertEqual(value_pb.string_value, TEXT) @@ -122,21 +122,21 @@ def test_w_list(self): from google.protobuf.struct_pb2 import Value from google.protobuf.struct_pb2 import ListValue - value_pb = self._callFUT([u"a", u"b", u"c"]) + value_pb = self._callFUT(["a", "b", "c"]) self.assertIsInstance(value_pb, Value) self.assertIsInstance(value_pb.list_value, ListValue) values = value_pb.list_value.values - self.assertEqual([value.string_value for value in values], [u"a", u"b", u"c"]) + self.assertEqual([value.string_value for value in values], ["a", "b", "c"]) def test_w_tuple(self): from google.protobuf.struct_pb2 import Value from google.protobuf.struct_pb2 import ListValue - value_pb = self._callFUT((u"a", u"b", u"c")) + value_pb = self._callFUT(("a", "b", "c")) self.assertIsInstance(value_pb, Value) self.assertIsInstance(value_pb.list_value, ListValue) values = value_pb.list_value.values - self.assertEqual([value.string_value for value in values], [u"a", u"b", u"c"]) + self.assertEqual([value.string_value for value in values], ["a", "b", "c"]) def test_w_bool(self): from google.protobuf.struct_pb2 import Value @@ -290,7 +290,9 @@ def test_w_numeric_precision_and_scale_invalid(self): for value, err_msg in cases: with self.subTest(value=value, err_msg=err_msg): self.assertRaisesRegex( - ValueError, err_msg, lambda: self._callFUT(value), + ValueError, + err_msg, + lambda: self._callFUT(value), ) def test_w_json(self): @@ -321,7 +323,7 @@ def test_empty(self): def test_w_single_value(self): from google.protobuf.struct_pb2 import ListValue - VALUE = u"value" + VALUE = "value" result = self._callFUT(values=[VALUE]) self.assertIsInstance(result, ListValue) self.assertEqual(len(result.values), 1) @@ -330,7 +332,7 @@ def test_w_single_value(self): def test_w_multiple_values(self): from google.protobuf.struct_pb2 import ListValue - VALUE_1 = u"value" + VALUE_1 = "value" VALUE_2 = 42 result = self._callFUT(values=[VALUE_1, VALUE_2]) self.assertIsInstance(result, ListValue) @@ -363,7 +365,7 @@ def test_w_single_values(self): def test_w_multiple_values(self): from google.protobuf.struct_pb2 import ListValue - values = [[0, u"A"], [1, u"B"]] + values = [[0, "A"], [1, "B"]] result = self._callFUT(values=values) self.assertEqual(len(result), len(values)) for found, expected in zip(result, values): @@ -394,7 +396,7 @@ def test_w_string(self): from google.cloud.spanner_v1 import Type from google.cloud.spanner_v1 import TypeCode - VALUE = u"Value" + VALUE = "Value" field_type = Type(code=TypeCode.STRING) value_pb = Value(string_value=VALUE) @@ -537,7 +539,7 @@ def test_w_struct(self): from google.cloud.spanner_v1 import TypeCode from google.cloud.spanner_v1._helpers import _make_list_value_pb - VALUES = [u"phred", 32] + VALUES = ["phred", 32] struct_type_pb = StructType( fields=[ StructType.Field(name="name", type_=Type(code=TypeCode.STRING)), @@ -621,7 +623,7 @@ def test_non_empty(self): from google.cloud.spanner_v1 import TypeCode from google.cloud.spanner_v1._helpers import _make_list_value_pbs - VALUES = [[u"phred", 32], [u"bharney", 31]] + VALUES = [["phred", 32], ["bharney", 31]] struct_type_pb = StructType( fields=[ StructType.Field(name="name", type_=Type(code=TypeCode.STRING)), diff --git a/tests/unit/test_backup.py b/tests/unit/test_backup.py index 035a2c9605..00621c2148 100644 --- a/tests/unit/test_backup.py +++ b/tests/unit/test_backup.py @@ -241,17 +241,23 @@ def test_create_grpc_error(self): self.BACKUP_ID, instance, database=self.DATABASE_NAME, expire_time=timestamp ) - backup_pb = Backup(database=self.DATABASE_NAME, expire_time=timestamp,) + backup_pb = Backup( + database=self.DATABASE_NAME, + expire_time=timestamp, + ) with self.assertRaises(GoogleAPICallError): backup.create() request = CreateBackupRequest( - parent=self.INSTANCE_NAME, backup_id=self.BACKUP_ID, backup=backup_pb, + parent=self.INSTANCE_NAME, + backup_id=self.BACKUP_ID, + backup=backup_pb, ) api.create_backup.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", backup.name)], + request=request, + metadata=[("google-cloud-resource-prefix", backup.name)], ) def test_create_already_exists(self): @@ -269,17 +275,23 @@ def test_create_already_exists(self): self.BACKUP_ID, instance, database=self.DATABASE_NAME, expire_time=timestamp ) - backup_pb = Backup(database=self.DATABASE_NAME, expire_time=timestamp,) + backup_pb = Backup( + database=self.DATABASE_NAME, + expire_time=timestamp, + ) with self.assertRaises(Conflict): backup.create() request = CreateBackupRequest( - parent=self.INSTANCE_NAME, backup_id=self.BACKUP_ID, backup=backup_pb, + parent=self.INSTANCE_NAME, + backup_id=self.BACKUP_ID, + backup=backup_pb, ) api.create_backup.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", backup.name)], + request=request, + metadata=[("google-cloud-resource-prefix", backup.name)], ) def test_create_instance_not_found(self): @@ -297,17 +309,23 @@ def test_create_instance_not_found(self): self.BACKUP_ID, instance, database=self.DATABASE_NAME, expire_time=timestamp ) - backup_pb = Backup(database=self.DATABASE_NAME, expire_time=timestamp,) + backup_pb = Backup( + database=self.DATABASE_NAME, + expire_time=timestamp, + ) with self.assertRaises(NotFound): backup.create() request = CreateBackupRequest( - parent=self.INSTANCE_NAME, backup_id=self.BACKUP_ID, backup=backup_pb, + parent=self.INSTANCE_NAME, + backup_id=self.BACKUP_ID, + backup=backup_pb, ) api.create_backup.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", backup.name)], + request=request, + metadata=[("google-cloud-resource-prefix", backup.name)], ) def test_create_expire_time_not_set(self): @@ -370,7 +388,8 @@ def test_create_success(self): ) api.create_backup.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", backup.name)], + request=request, + metadata=[("google-cloud-resource-prefix", backup.name)], ) def test_create_w_invalid_encryption_config(self): @@ -585,7 +604,10 @@ def test_update_expire_time_grpc_error(self): with self.assertRaises(Unknown): backup.update_expire_time(expire_time) - backup_update = Backup(name=self.BACKUP_NAME, expire_time=expire_time,) + backup_update = Backup( + name=self.BACKUP_NAME, + expire_time=expire_time, + ) update_mask = {"paths": ["expire_time"]} api.update_backup.assert_called_once_with( backup=backup_update, @@ -607,7 +629,10 @@ def test_update_expire_time_not_found(self): with self.assertRaises(NotFound): backup.update_expire_time(expire_time) - backup_update = Backup(name=self.BACKUP_NAME, expire_time=expire_time,) + backup_update = Backup( + name=self.BACKUP_NAME, + expire_time=expire_time, + ) update_mask = {"paths": ["expire_time"]} api.update_backup.assert_called_once_with( backup=backup_update, @@ -627,7 +652,10 @@ def test_update_expire_time_success(self): backup.update_expire_time(expire_time) - backup_update = Backup(name=self.BACKUP_NAME, expire_time=expire_time,) + backup_update = Backup( + name=self.BACKUP_NAME, + expire_time=expire_time, + ) update_mask = {"paths": ["expire_time"]} api.update_backup.assert_called_once_with( backup=backup_update, diff --git a/tests/unit/test_batch.py b/tests/unit/test_batch.py index d6af07ce7e..2d685acfbf 100644 --- a/tests/unit/test_batch.py +++ b/tests/unit/test_batch.py @@ -20,8 +20,8 @@ TABLE_NAME = "citizens" COLUMNS = ["email", "first_name", "last_name", "age"] VALUES = [ - [u"phred@exammple.com", u"Phred", u"Phlyntstone", 32], - [u"bharney@example.com", u"Bharney", u"Rhubble", 31], + ["phred@exammple.com", "Phred", "Phlyntstone", 32], + ["bharney@example.com", "Bharney", "Rhubble", 31], ] BASE_ATTRIBUTES = { "db.type": "spanner", @@ -293,16 +293,21 @@ def _test_commit_with_request_options(self, request_options=None): ) def test_commit_w_request_tag_success(self): - request_options = RequestOptions(request_tag="tag-1",) + request_options = RequestOptions( + request_tag="tag-1", + ) self._test_commit_with_request_options(request_options=request_options) def test_commit_w_transaction_tag_success(self): - request_options = RequestOptions(transaction_tag="tag-1-1",) + request_options = RequestOptions( + transaction_tag="tag-1-1", + ) self._test_commit_with_request_options(request_options=request_options) def test_commit_w_request_and_transaction_tag_success(self): request_options = RequestOptions( - request_tag="tag-1", transaction_tag="tag-1-1", + request_tag="tag-1", + transaction_tag="tag-1-1", ) self._test_commit_with_request_options(request_options=request_options) @@ -412,7 +417,9 @@ def __init__(self, **kwargs): self.__dict__.update(**kwargs) def commit( - self, request=None, metadata=None, + self, + request=None, + metadata=None, ): from google.api_core.exceptions import Unknown diff --git a/tests/unit/test_database.py b/tests/unit/test_database.py index df5554d153..9cabc99945 100644 --- a/tests/unit/test_database.py +++ b/tests/unit/test_database.py @@ -777,7 +777,9 @@ def test_update_ddl_grpc_error(self): database.update_ddl(DDL_STATEMENTS) expected_request = UpdateDatabaseDdlRequest( - database=self.DATABASE_NAME, statements=DDL_STATEMENTS, operation_id="", + database=self.DATABASE_NAME, + statements=DDL_STATEMENTS, + operation_id="", ) api.update_database_ddl.assert_called_once_with( @@ -801,7 +803,9 @@ def test_update_ddl_not_found(self): database.update_ddl(DDL_STATEMENTS) expected_request = UpdateDatabaseDdlRequest( - database=self.DATABASE_NAME, statements=DDL_STATEMENTS, operation_id="", + database=self.DATABASE_NAME, + statements=DDL_STATEMENTS, + operation_id="", ) api.update_database_ddl.assert_called_once_with( @@ -826,7 +830,9 @@ def test_update_ddl(self): self.assertIs(future, op_future) expected_request = UpdateDatabaseDdlRequest( - database=self.DATABASE_NAME, statements=DDL_STATEMENTS, operation_id="", + database=self.DATABASE_NAME, + statements=DDL_STATEMENTS, + operation_id="", ) api.update_database_ddl.assert_called_once_with( @@ -1071,12 +1077,14 @@ def test_execute_partitioned_dml_w_request_options(self): def test_execute_partitioned_dml_w_trx_tag_ignored(self): self._execute_partitioned_dml_helper( - dml=DML_W_PARAM, request_options=RequestOptions(transaction_tag="trx-tag"), + dml=DML_W_PARAM, + request_options=RequestOptions(transaction_tag="trx-tag"), ) def test_execute_partitioned_dml_w_req_tag_used(self): self._execute_partitioned_dml_helper( - dml=DML_W_PARAM, request_options=RequestOptions(request_tag="req-tag"), + dml=DML_W_PARAM, + request_options=RequestOptions(request_tag="req-tag"), ) def test_execute_partitioned_dml_wo_params_retry_aborted(self): @@ -1598,7 +1606,8 @@ def test_context_mgr_success(self): request_options=RequestOptions(transaction_tag=self.TRANSACTION_TAG), ) api.commit.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", database.name)], + request=request, + metadata=[("google-cloud-resource-prefix", database.name)], ) def test_context_mgr_w_commit_stats_success(self): @@ -1641,7 +1650,8 @@ def test_context_mgr_w_commit_stats_success(self): request_options=RequestOptions(), ) api.commit.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", database.name)], + request=request, + metadata=[("google-cloud-resource-prefix", database.name)], ) database.logger.info.assert_called_once_with( @@ -1681,7 +1691,8 @@ def test_context_mgr_w_commit_stats_error(self): request_options=RequestOptions(), ) api.commit.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", database.name)], + request=request, + metadata=[("google-cloud-resource-prefix", database.name)], ) database.logger.info.assert_not_called() diff --git a/tests/unit/test_keyset.py b/tests/unit/test_keyset.py index 86a814c752..a7bad4070d 100644 --- a/tests/unit/test_keyset.py +++ b/tests/unit/test_keyset.py @@ -30,19 +30,19 @@ def test_ctor_no_start_no_end(self): self._make_one() def test_ctor_w_start_open_and_start_closed(self): - KEY_1 = [u"key_1"] - KEY_2 = [u"key_2"] + KEY_1 = ["key_1"] + KEY_2 = ["key_2"] with self.assertRaises(ValueError): self._make_one(start_open=KEY_1, start_closed=KEY_2) def test_ctor_w_end_open_and_end_closed(self): - KEY_1 = [u"key_1"] - KEY_2 = [u"key_2"] + KEY_1 = ["key_1"] + KEY_2 = ["key_2"] with self.assertRaises(ValueError): self._make_one(end_open=KEY_1, end_closed=KEY_2) def test_ctor_w_only_start_open(self): - KEY_1 = [u"key_1"] + KEY_1 = ["key_1"] krange = self._make_one(start_open=KEY_1) self.assertEqual(krange.start_open, KEY_1) self.assertEqual(krange.start_closed, None) @@ -50,7 +50,7 @@ def test_ctor_w_only_start_open(self): self.assertEqual(krange.end_closed, []) def test_ctor_w_only_start_closed(self): - KEY_1 = [u"key_1"] + KEY_1 = ["key_1"] krange = self._make_one(start_closed=KEY_1) self.assertEqual(krange.start_open, None) self.assertEqual(krange.start_closed, KEY_1) @@ -58,7 +58,7 @@ def test_ctor_w_only_start_closed(self): self.assertEqual(krange.end_closed, []) def test_ctor_w_only_end_open(self): - KEY_1 = [u"key_1"] + KEY_1 = ["key_1"] krange = self._make_one(end_open=KEY_1) self.assertEqual(krange.start_open, None) self.assertEqual(krange.start_closed, []) @@ -66,7 +66,7 @@ def test_ctor_w_only_end_open(self): self.assertEqual(krange.end_closed, None) def test_ctor_w_only_end_closed(self): - KEY_1 = [u"key_1"] + KEY_1 = ["key_1"] krange = self._make_one(end_closed=KEY_1) self.assertEqual(krange.start_open, None) self.assertEqual(krange.start_closed, []) @@ -74,8 +74,8 @@ def test_ctor_w_only_end_closed(self): self.assertEqual(krange.end_closed, KEY_1) def test_ctor_w_start_open_and_end_closed(self): - KEY_1 = [u"key_1"] - KEY_2 = [u"key_2"] + KEY_1 = ["key_1"] + KEY_2 = ["key_2"] krange = self._make_one(start_open=KEY_1, end_closed=KEY_2) self.assertEqual(krange.start_open, KEY_1) self.assertEqual(krange.start_closed, None) @@ -83,8 +83,8 @@ def test_ctor_w_start_open_and_end_closed(self): self.assertEqual(krange.end_closed, KEY_2) def test_ctor_w_start_closed_and_end_open(self): - KEY_1 = [u"key_1"] - KEY_2 = [u"key_2"] + KEY_1 = ["key_1"] + KEY_2 = ["key_2"] krange = self._make_one(start_closed=KEY_1, end_open=KEY_2) self.assertEqual(krange.start_open, None) self.assertEqual(krange.start_closed, KEY_1) @@ -92,24 +92,24 @@ def test_ctor_w_start_closed_and_end_open(self): self.assertEqual(krange.end_closed, None) def test___eq___self(self): - key_1 = [u"key_1"] + key_1 = ["key_1"] krange = self._make_one(end_open=key_1) self.assertEqual(krange, krange) def test___eq___other_type(self): - key_1 = [u"key_1"] + key_1 = ["key_1"] krange = self._make_one(end_open=key_1) self.assertNotEqual(krange, object()) def test___eq___other_hit(self): - key_1 = [u"key_1"] + key_1 = ["key_1"] krange = self._make_one(end_open=key_1) other = self._make_one(end_open=key_1) self.assertEqual(krange, other) def test___eq___other(self): - key_1 = [u"key_1"] - key_2 = [u"key_2"] + key_1 = ["key_1"] + key_2 = ["key_2"] krange = self._make_one(end_open=key_1) other = self._make_one(start_closed=key_2, end_open=key_1) self.assertNotEqual(krange, other) @@ -117,18 +117,21 @@ def test___eq___other(self): def test_to_pb_w_start_closed_and_end_open(self): from google.cloud.spanner_v1.types.keys import KeyRange as KeyRangePB - key1 = u"key_1" - key2 = u"key_2" + key1 = "key_1" + key2 = "key_2" key_range = self._make_one(start_closed=[key1], end_open=[key2]) key_range_pb = key_range._to_pb() - expected = KeyRangePB(start_closed=[key1], end_open=[key2],) + expected = KeyRangePB( + start_closed=[key1], + end_open=[key2], + ) self.assertEqual(key_range_pb, expected) def test_to_pb_w_start_open_and_end_closed(self): from google.cloud.spanner_v1.types.keys import KeyRange as KeyRangePB - key1 = u"key_1" - key2 = u"key_2" + key1 = "key_1" + key2 = "key_2" key_range = self._make_one(start_open=[key1], end_closed=[key2]) key_range_pb = key_range._to_pb() expected = KeyRangePB(start_open=[key1], end_closed=[key2]) @@ -137,28 +140,28 @@ def test_to_pb_w_start_open_and_end_closed(self): def test_to_pb_w_empty_list(self): from google.cloud.spanner_v1.types.keys import KeyRange as KeyRangePB - key = u"key" + key = "key" key_range = self._make_one(start_closed=[], end_closed=[key]) key_range_pb = key_range._to_pb() expected = KeyRangePB(start_closed=[], end_closed=[key]) self.assertEqual(key_range_pb, expected) def test_to_dict_w_start_closed_and_end_open(self): - key1 = u"key_1" - key2 = u"key_2" + key1 = "key_1" + key2 = "key_2" key_range = self._make_one(start_closed=[key1], end_open=[key2]) expected = {"start_closed": [key1], "end_open": [key2]} self.assertEqual(key_range._to_dict(), expected) def test_to_dict_w_start_open_and_end_closed(self): - key1 = u"key_1" - key2 = u"key_2" + key1 = "key_1" + key2 = "key_2" key_range = self._make_one(start_open=[key1], end_closed=[key2]) expected = {"start_open": [key1], "end_closed": [key2]} self.assertEqual(key_range._to_dict(), expected) def test_to_dict_w_end_closed(self): - key = u"key" + key = "key" key_range = self._make_one(end_closed=[key]) expected = {"end_closed": [key]} self.assertEqual(key_range._to_dict(), expected) @@ -181,7 +184,7 @@ def test_ctor_w_all(self): self.assertEqual(keyset.ranges, []) def test_ctor_w_keys(self): - KEYS = [[u"key1"], [u"key2"]] + KEYS = [["key1"], ["key2"]] keyset = self._make_one(keys=KEYS) @@ -192,8 +195,8 @@ def test_ctor_w_keys(self): def test_ctor_w_ranges(self): from google.cloud.spanner_v1.keyset import KeyRange - range_1 = KeyRange(start_closed=[u"key1"], end_open=[u"key3"]) - range_2 = KeyRange(start_open=[u"key5"], end_closed=[u"key6"]) + range_1 = KeyRange(start_closed=["key1"], end_open=["key3"]) + range_2 = KeyRange(start_open=["key5"], end_closed=["key6"]) keyset = self._make_one(ranges=[range_1, range_2]) @@ -209,8 +212,8 @@ def test_ctor_w_all_and_keys(self): def test_ctor_w_all_and_ranges(self): from google.cloud.spanner_v1.keyset import KeyRange - range_1 = KeyRange(start_closed=[u"key1"], end_open=[u"key3"]) - range_2 = KeyRange(start_open=[u"key5"], end_closed=[u"key6"]) + range_1 = KeyRange(start_closed=["key1"], end_open=["key3"]) + range_2 = KeyRange(start_open=["key5"], end_closed=["key6"]) with self.assertRaises(ValueError): self._make_one(all_=True, ranges=[range_1, range_2]) @@ -229,13 +232,13 @@ def test___eq___w_all_hit(self): self.assertEqual(keyset, other) def test___eq___w_all_miss(self): - keys = [[u"key1"], [u"key2"]] + keys = [["key1"], ["key2"]] keyset = self._make_one(all_=True) other = self._make_one(keys=keys) self.assertNotEqual(keyset, other) def test___eq___w_keys_hit(self): - keys = [[u"key1"], [u"key2"]] + keys = [["key1"], ["key2"]] keyset = self._make_one(keys=keys) other = self._make_one(keys=keys) @@ -243,7 +246,7 @@ def test___eq___w_keys_hit(self): self.assertEqual(keyset, other) def test___eq___w_keys_miss(self): - keys = [[u"key1"], [u"key2"]] + keys = [["key1"], ["key2"]] keyset = self._make_one(keys=keys[:1]) other = self._make_one(keys=keys[1:]) @@ -253,8 +256,8 @@ def test___eq___w_keys_miss(self): def test___eq___w_ranges_hit(self): from google.cloud.spanner_v1.keyset import KeyRange - range_1 = KeyRange(start_closed=[u"key1"], end_open=[u"key3"]) - range_2 = KeyRange(start_open=[u"key5"], end_closed=[u"key6"]) + range_1 = KeyRange(start_closed=["key1"], end_open=["key3"]) + range_2 = KeyRange(start_open=["key5"], end_closed=["key6"]) keyset = self._make_one(ranges=[range_1, range_2]) other = self._make_one(ranges=[range_1, range_2]) @@ -264,8 +267,8 @@ def test___eq___w_ranges_hit(self): def test___eq___w_ranges_miss(self): from google.cloud.spanner_v1.keyset import KeyRange - range_1 = KeyRange(start_closed=[u"key1"], end_open=[u"key3"]) - range_2 = KeyRange(start_open=[u"key5"], end_closed=[u"key6"]) + range_1 = KeyRange(start_closed=["key1"], end_open=["key3"]) + range_2 = KeyRange(start_open=["key5"], end_closed=["key6"]) keyset = self._make_one(ranges=[range_1]) other = self._make_one(ranges=[range_2]) @@ -287,7 +290,7 @@ def test_to_pb_w_all(self): def test_to_pb_w_only_keys(self): from google.cloud.spanner_v1 import KeySetPB - KEYS = [[u"key1"], [u"key2"]] + KEYS = [["key1"], ["key2"]] keyset = self._make_one(keys=KEYS) result = keyset._to_pb() @@ -307,10 +310,10 @@ def test_to_pb_w_only_ranges(self): from google.cloud.spanner_v1 import KeySetPB from google.cloud.spanner_v1.keyset import KeyRange - KEY_1 = u"KEY_1" - KEY_2 = u"KEY_2" - KEY_3 = u"KEY_3" - KEY_4 = u"KEY_4" + KEY_1 = "KEY_1" + KEY_2 = "KEY_2" + KEY_3 = "KEY_3" + KEY_4 = "KEY_4" RANGES = [ KeyRange(start_open=KEY_1, end_closed=KEY_2), KeyRange(start_closed=KEY_3, end_open=KEY_4), @@ -337,7 +340,7 @@ def test_to_dict_w_all(self): self.assertEqual(keyset._to_dict(), expected) def test_to_dict_w_only_keys(self): - KEYS = [[u"key1"], [u"key2"]] + KEYS = [["key1"], ["key2"]] keyset = self._make_one(keys=KEYS) expected = {"keys": KEYS, "ranges": []} @@ -346,10 +349,10 @@ def test_to_dict_w_only_keys(self): def test_to_dict_w_only_ranges(self): from google.cloud.spanner_v1.keyset import KeyRange - key_1 = u"KEY_1" - key_2 = u"KEY_2" - key_3 = u"KEY_3" - key_4 = u"KEY_4" + key_1 = "KEY_1" + key_2 = "KEY_2" + key_3 = "KEY_3" + key_4 = "KEY_4" ranges = [ KeyRange(start_open=[key_1], end_closed=[key_2]), KeyRange(start_closed=[key_3], end_open=[key_4]), @@ -377,7 +380,7 @@ def test_from_dict_w_all(self): def test_from_dict_w_keys(self): klass = self._get_target_class() - keys = [[u"key1"], [u"key2"]] + keys = [["key1"], ["key2"]] mapping = {"keys": keys} keyset = klass._from_dict(mapping) @@ -390,10 +393,10 @@ def test_from_dict_w_ranges(self): from google.cloud.spanner_v1.keyset import KeyRange klass = self._get_target_class() - key_1 = u"KEY_1" - key_2 = u"KEY_2" - key_3 = u"KEY_3" - key_4 = u"KEY_4" + key_1 = "KEY_1" + key_2 = "KEY_2" + key_3 = "KEY_3" + key_4 = "KEY_4" mapping = { "ranges": [ {"start_open": [key_1], "end_closed": [key_2]}, diff --git a/tests/unit/test_session.py b/tests/unit/test_session.py index fe78567f6b..0f297654bb 100644 --- a/tests/unit/test_session.py +++ b/tests/unit/test_session.py @@ -140,7 +140,9 @@ def test_create_ok(self): self.assertEqual(session.session_id, self.SESSION_ID) - request = CreateSessionRequest(database=database.name,) + request = CreateSessionRequest( + database=database.name, + ) gax_api.create_session.assert_called_once_with( request=request, metadata=[("google-cloud-resource-prefix", database.name)] @@ -167,11 +169,13 @@ def test_create_w_labels(self): self.assertEqual(session.session_id, self.SESSION_ID) request = CreateSessionRequest( - database=database.name, session=SessionPB(labels=labels), + database=database.name, + session=SessionPB(labels=labels), ) gax_api.create_session.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", database.name)], + request=request, + metadata=[("google-cloud-resource-prefix", database.name)], ) self.assertSpanAttributes( @@ -334,10 +338,14 @@ def test_ping_hit(self): session.ping() - request = ExecuteSqlRequest(session=self.SESSION_NAME, sql="SELECT 1",) + request = ExecuteSqlRequest( + session=self.SESSION_NAME, + sql="SELECT 1", + ) gax_api.execute_sql.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", database.name)], + request=request, + metadata=[("google-cloud-resource-prefix", database.name)], ) def test_ping_miss(self): @@ -354,10 +362,14 @@ def test_ping_miss(self): with self.assertRaises(NotFound): session.ping() - request = ExecuteSqlRequest(session=self.SESSION_NAME, sql="SELECT 1",) + request = ExecuteSqlRequest( + session=self.SESSION_NAME, + sql="SELECT 1", + ) gax_api.execute_sql.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", database.name)], + request=request, + metadata=[("google-cloud-resource-prefix", database.name)], ) def test_ping_error(self): @@ -374,10 +386,14 @@ def test_ping_error(self): with self.assertRaises(Unknown): session.ping() - request = ExecuteSqlRequest(session=self.SESSION_NAME, sql="SELECT 1",) + request = ExecuteSqlRequest( + session=self.SESSION_NAME, + sql="SELECT 1", + ) gax_api.execute_sql.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", database.name)], + request=request, + metadata=[("google-cloud-resource-prefix", database.name)], ) def test_delete_wo_session_id(self): @@ -833,7 +849,8 @@ def unit_of_work(txn, *args, **kw): request_options=RequestOptions(), ) gax_api.commit.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", database.name)], + request=request, + metadata=[("google-cloud-resource-prefix", database.name)], ) def test_run_in_transaction_w_commit_error(self): @@ -884,7 +901,8 @@ def unit_of_work(txn, *args, **kw): request_options=RequestOptions(), ) gax_api.commit.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", database.name)], + request=request, + metadata=[("google-cloud-resource-prefix", database.name)], ) def test_run_in_transaction_w_abort_no_retry_metadata(self): @@ -1141,7 +1159,8 @@ def unit_of_work(txn, *args, **kw): request_options=RequestOptions(), ) gax_api.commit.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", database.name)], + request=request, + metadata=[("google-cloud-resource-prefix", database.name)], ) def test_run_in_transaction_w_abort_w_retry_metadata_deadline(self): @@ -1232,7 +1251,8 @@ def _time(_results=[1, 1.5]): request_options=RequestOptions(), ) gax_api.commit.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", database.name)], + request=request, + metadata=[("google-cloud-resource-prefix", database.name)], ) def test_run_in_transaction_w_timeout(self): @@ -1388,7 +1408,8 @@ def unit_of_work(txn, *args, **kw): request_options=RequestOptions(), ) gax_api.commit.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", database.name)], + request=request, + metadata=[("google-cloud-resource-prefix", database.name)], ) database.logger.info.assert_called_once_with( "CommitStats: mutation_count: 4\n", extra={"commit_stats": commit_stats} @@ -1451,7 +1472,8 @@ def unit_of_work(txn, *args, **kw): request_options=RequestOptions(), ) gax_api.commit.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", database.name)], + request=request, + metadata=[("google-cloud-resource-prefix", database.name)], ) database.logger.info.assert_not_called() @@ -1520,7 +1542,8 @@ def unit_of_work(txn, *args, **kw): request_options=RequestOptions(transaction_tag=transaction_tag), ) gax_api.commit.assert_called_once_with( - request=request, metadata=[("google-cloud-resource-prefix", database.name)], + request=request, + metadata=[("google-cloud-resource-prefix", database.name)], ) def test_delay_helper_w_no_delay(self): diff --git a/tests/unit/test_snapshot.py b/tests/unit/test_snapshot.py index ef162fd29d..5b515f1bbb 100644 --- a/tests/unit/test_snapshot.py +++ b/tests/unit/test_snapshot.py @@ -420,7 +420,7 @@ def _read_helper( from google.cloud.spanner_v1.keyset import KeySet from google.cloud.spanner_v1._helpers import _make_value_pb - VALUES = [[u"bharney", 31], [u"phred", 32]] + VALUES = [["bharney", 31], ["phred", 32]] VALUE_PBS = [[_make_value_pb(item) for item in row] for row in VALUES] struct_type_pb = StructType( fields=[ @@ -541,16 +541,21 @@ def test_read_wo_multi_use(self): self._read_helper(multi_use=False) def test_read_w_request_tag_success(self): - request_options = RequestOptions(request_tag="tag-1",) + request_options = RequestOptions( + request_tag="tag-1", + ) self._read_helper(multi_use=False, request_options=request_options) def test_read_w_transaction_tag_success(self): - request_options = RequestOptions(transaction_tag="tag-1-1",) + request_options = RequestOptions( + transaction_tag="tag-1-1", + ) self._read_helper(multi_use=False, request_options=request_options) def test_read_w_request_and_transaction_tag_success(self): request_options = RequestOptions( - request_tag="tag-1", transaction_tag="tag-1-1", + request_tag="tag-1", + transaction_tag="tag-1-1", ) self._read_helper(multi_use=False, request_options=request_options) @@ -650,7 +655,7 @@ def _execute_sql_helper( _merge_query_options, ) - VALUES = [[u"bharney", u"rhubbyl", 31], [u"phred", u"phlyntstone", 32]] + VALUES = [["bharney", "rhubbyl", 31], ["phred", "phlyntstone", 32]] VALUE_PBS = [[_make_value_pb(item) for item in row] for row in VALUES] MODE = 2 # PROFILE struct_type_pb = StructType( @@ -807,16 +812,21 @@ def test_execute_sql_w_request_options(self): ) def test_execute_sql_w_request_tag_success(self): - request_options = RequestOptions(request_tag="tag-1",) + request_options = RequestOptions( + request_tag="tag-1", + ) self._execute_sql_helper(multi_use=False, request_options=request_options) def test_execute_sql_w_transaction_tag_success(self): - request_options = RequestOptions(transaction_tag="tag-1-1",) + request_options = RequestOptions( + transaction_tag="tag-1-1", + ) self._execute_sql_helper(multi_use=False, request_options=request_options) def test_execute_sql_w_request_and_transaction_tag_success(self): request_options = RequestOptions( - request_tag="tag-1", transaction_tag="tag-1-1", + request_tag="tag-1", + transaction_tag="tag-1-1", ) self._execute_sql_helper(multi_use=False, request_options=request_options) diff --git a/tests/unit/test_streamed.py b/tests/unit/test_streamed.py index de0c8875bf..2714ddfb45 100644 --- a/tests/unit/test_streamed.py +++ b/tests/unit/test_streamed.py @@ -171,11 +171,11 @@ def test__merge_chunk_numeric(self): streamed = self._make_one(iterator) FIELDS = [self._make_scalar_field("total", TypeCode.NUMERIC)] streamed._metadata = self._make_result_set_metadata(FIELDS) - streamed._pending_chunk = self._make_value(u"1234.") - chunk = self._make_value(u"5678") + streamed._pending_chunk = self._make_value("1234.") + chunk = self._make_value("5678") merged = streamed._merge_chunk(chunk) - self.assertEqual(merged.string_value, u"1234.5678") + self.assertEqual(merged.string_value, "1234.5678") def test__merge_chunk_int64(self): from google.cloud.spanner_v1 import TypeCode @@ -198,11 +198,11 @@ def test__merge_chunk_float64_nan_string(self): streamed = self._make_one(iterator) FIELDS = [self._make_scalar_field("weight", TypeCode.FLOAT64)] streamed._metadata = self._make_result_set_metadata(FIELDS) - streamed._pending_chunk = self._make_value(u"Na") - chunk = self._make_value(u"N") + streamed._pending_chunk = self._make_value("Na") + chunk = self._make_value("N") merged = streamed._merge_chunk(chunk) - self.assertEqual(merged.string_value, u"NaN") + self.assertEqual(merged.string_value, "NaN") def test__merge_chunk_float64_w_empty(self): from google.cloud.spanner_v1 import TypeCode @@ -238,12 +238,12 @@ def test__merge_chunk_string(self): streamed = self._make_one(iterator) FIELDS = [self._make_scalar_field("name", TypeCode.STRING)] streamed._metadata = self._make_result_set_metadata(FIELDS) - streamed._pending_chunk = self._make_value(u"phred") - chunk = self._make_value(u"wylma") + streamed._pending_chunk = self._make_value("phred") + chunk = self._make_value("wylma") merged = streamed._merge_chunk(chunk) - self.assertEqual(merged.string_value, u"phredwylma") + self.assertEqual(merged.string_value, "phredwylma") self.assertIsNone(streamed._pending_chunk) def test__merge_chunk_string_w_bytes(self): @@ -254,21 +254,21 @@ def test__merge_chunk_string_w_bytes(self): FIELDS = [self._make_scalar_field("image", TypeCode.BYTES)] streamed._metadata = self._make_result_set_metadata(FIELDS) streamed._pending_chunk = self._make_value( - u"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA" - u"6fptVAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA\n" + "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA" + "6fptVAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA\n" ) chunk = self._make_value( - u"B3RJTUUH4QQGFwsBTL3HMwAAABJpVFh0Q29tbWVudAAAAAAAU0FNUExF" - u"MG3E+AAAAApJREFUCNdj\nYAAAAAIAAeIhvDMAAAAASUVORK5CYII=\n" + "B3RJTUUH4QQGFwsBTL3HMwAAABJpVFh0Q29tbWVudAAAAAAAU0FNUExF" + "MG3E+AAAAApJREFUCNdj\nYAAAAAIAAeIhvDMAAAAASUVORK5CYII=\n" ) merged = streamed._merge_chunk(chunk) self.assertEqual( merged.string_value, - u"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACXBIWXMAAAsTAAAL" - u"EwEAmpwYAAAA\nB3RJTUUH4QQGFwsBTL3HMwAAABJpVFh0Q29tbWVudAAAAAAAU0" - u"FNUExFMG3E+AAAAApJREFUCNdj\nYAAAAAIAAeIhvDMAAAAASUVORK5CYII=\n", + "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACXBIWXMAAAsTAAAL" + "EwEAmpwYAAAA\nB3RJTUUH4QQGFwsBTL3HMwAAABJpVFh0Q29tbWVudAAAAAAAU0" + "FNUExFMG3E+AAAAApJREFUCNdj\nYAAAAAIAAeIhvDMAAAAASUVORK5CYII=\n", ) self.assertIsNone(streamed._pending_chunk) @@ -332,12 +332,12 @@ def test__merge_chunk_array_of_string_with_empty(self): streamed = self._make_one(iterator) FIELDS = [self._make_array_field("name", element_type_code=TypeCode.STRING)] streamed._metadata = self._make_result_set_metadata(FIELDS) - streamed._pending_chunk = self._make_list_value([u"A", u"B", u"C"]) + streamed._pending_chunk = self._make_list_value(["A", "B", "C"]) chunk = self._make_list_value([]) merged = streamed._merge_chunk(chunk) - expected = self._make_list_value([u"A", u"B", u"C"]) + expected = self._make_list_value(["A", "B", "C"]) self.assertEqual(merged, expected) self.assertIsNone(streamed._pending_chunk) @@ -348,12 +348,12 @@ def test__merge_chunk_array_of_string(self): streamed = self._make_one(iterator) FIELDS = [self._make_array_field("name", element_type_code=TypeCode.STRING)] streamed._metadata = self._make_result_set_metadata(FIELDS) - streamed._pending_chunk = self._make_list_value([u"A", u"B", u"C"]) - chunk = self._make_list_value([u"D", u"E"]) + streamed._pending_chunk = self._make_list_value(["A", "B", "C"]) + chunk = self._make_list_value(["D", "E"]) merged = streamed._merge_chunk(chunk) - expected = self._make_list_value([u"A", u"B", u"CD", u"E"]) + expected = self._make_list_value(["A", "B", "CD", "E"]) self.assertEqual(merged, expected) self.assertIsNone(streamed._pending_chunk) @@ -364,12 +364,12 @@ def test__merge_chunk_array_of_string_with_null(self): streamed = self._make_one(iterator) FIELDS = [self._make_array_field("name", element_type_code=TypeCode.STRING)] streamed._metadata = self._make_result_set_metadata(FIELDS) - streamed._pending_chunk = self._make_list_value([u"A", u"B", u"C"]) - chunk = self._make_list_value([None, u"D", u"E"]) + streamed._pending_chunk = self._make_list_value(["A", "B", "C"]) + chunk = self._make_list_value([None, "D", "E"]) merged = streamed._merge_chunk(chunk) - expected = self._make_list_value([u"A", u"B", u"C", None, u"D", u"E"]) + expected = self._make_list_value(["A", "B", "C", None, "D", "E"]) self.assertEqual(merged, expected) self.assertIsNone(streamed._pending_chunk) @@ -380,10 +380,10 @@ def test__merge_chunk_array_of_string_with_null_pending(self): streamed = self._make_one(iterator) FIELDS = [self._make_array_field("name", element_type_code=TypeCode.STRING)] streamed._metadata = self._make_result_set_metadata(FIELDS) - streamed._pending_chunk = self._make_list_value([u"A", u"B", u"C", None]) - chunk = self._make_list_value([u"D", u"E"]) + streamed._pending_chunk = self._make_list_value(["A", "B", "C", None]) + chunk = self._make_list_value(["D", "E"]) merged = streamed._merge_chunk(chunk) - expected = self._make_list_value([u"A", u"B", u"C", None, u"D", u"E"]) + expected = self._make_list_value(["A", "B", "C", None, "D", "E"]) self.assertEqual(merged, expected) self.assertIsNone(streamed._pending_chunk) @@ -434,14 +434,14 @@ def test__merge_chunk_array_of_array_of_string(self): streamed._metadata = self._make_result_set_metadata(FIELDS) streamed._pending_chunk = self._make_list_value( value_pbs=[ - self._make_list_value([u"A", u"B"]), - self._make_list_value([u"C"]), + self._make_list_value(["A", "B"]), + self._make_list_value(["C"]), ] ) chunk = self._make_list_value( value_pbs=[ - self._make_list_value([u"D"]), - self._make_list_value([u"E", u"F"]), + self._make_list_value(["D"]), + self._make_list_value(["E", "F"]), ] ) @@ -449,9 +449,9 @@ def test__merge_chunk_array_of_array_of_string(self): expected = self._make_list_value( value_pbs=[ - self._make_list_value([u"A", u"B"]), - self._make_list_value([u"CD"]), - self._make_list_value([u"E", u"F"]), + self._make_list_value(["A", "B"]), + self._make_list_value(["CD"]), + self._make_list_value(["E", "F"]), ] ) self.assertEqual(merged, expected) @@ -467,14 +467,14 @@ def test__merge_chunk_array_of_struct(self): ) FIELDS = [self._make_array_field("test", element_type=struct_type)] streamed._metadata = self._make_result_set_metadata(FIELDS) - partial = self._make_list_value([u"Phred "]) + partial = self._make_list_value(["Phred "]) streamed._pending_chunk = self._make_list_value(value_pbs=[partial]) - rest = self._make_list_value([u"Phlyntstone", 31]) + rest = self._make_list_value(["Phlyntstone", 31]) chunk = self._make_list_value(value_pbs=[rest]) merged = streamed._merge_chunk(chunk) - struct = self._make_list_value([u"Phred Phlyntstone", 31]) + struct = self._make_list_value(["Phred Phlyntstone", 31]) expected = self._make_list_value(value_pbs=[struct]) self.assertEqual(merged, expected) self.assertIsNone(streamed._pending_chunk) @@ -489,7 +489,7 @@ def test__merge_chunk_array_of_struct_with_empty(self): ) FIELDS = [self._make_array_field("test", element_type=struct_type)] streamed._metadata = self._make_result_set_metadata(FIELDS) - partial = self._make_list_value([u"Phred "]) + partial = self._make_list_value(["Phred "]) streamed._pending_chunk = self._make_list_value(value_pbs=[partial]) rest = self._make_list_value([]) chunk = self._make_list_value(value_pbs=[rest]) @@ -514,14 +514,14 @@ def test__merge_chunk_array_of_struct_unmergeable(self): ) FIELDS = [self._make_array_field("test", element_type=struct_type)] streamed._metadata = self._make_result_set_metadata(FIELDS) - partial = self._make_list_value([u"Phred Phlyntstone", True]) + partial = self._make_list_value(["Phred Phlyntstone", True]) streamed._pending_chunk = self._make_list_value(value_pbs=[partial]) rest = self._make_list_value([True]) chunk = self._make_list_value(value_pbs=[rest]) merged = streamed._merge_chunk(chunk) - struct = self._make_list_value([u"Phred Phlyntstone", True, True]) + struct = self._make_list_value(["Phred Phlyntstone", True, True]) expected = self._make_list_value(value_pbs=[struct]) self.assertEqual(merged, expected) self.assertIsNone(streamed._pending_chunk) @@ -534,14 +534,14 @@ def test__merge_chunk_array_of_struct_unmergeable_split(self): ) FIELDS = [self._make_array_field("test", element_type=struct_type)] streamed._metadata = self._make_result_set_metadata(FIELDS) - partial = self._make_list_value([u"Phred Phlyntstone", 1.65]) + partial = self._make_list_value(["Phred Phlyntstone", 1.65]) streamed._pending_chunk = self._make_list_value(value_pbs=[partial]) rest = self._make_list_value(["brown"]) chunk = self._make_list_value(value_pbs=[rest]) merged = streamed._merge_chunk(chunk) - struct = self._make_list_value([u"Phred Phlyntstone", 1.65, "brown"]) + struct = self._make_list_value(["Phred Phlyntstone", 1.65, "brown"]) expected = self._make_list_value(value_pbs=[struct]) self.assertEqual(merged, expected) self.assertIsNone(streamed._pending_chunk) @@ -573,7 +573,7 @@ def test_merge_values_empty_and_partial(self): self._make_scalar_field("married", TypeCode.BOOL), ] streamed._metadata = self._make_result_set_metadata(FIELDS) - BARE = [u"Phred Phlyntstone", 42] + BARE = ["Phred Phlyntstone", 42] VALUES = [self._make_value(bare) for bare in BARE] streamed._current_row = [] streamed._merge_values(VALUES) @@ -591,7 +591,7 @@ def test_merge_values_empty_and_filled(self): self._make_scalar_field("married", TypeCode.BOOL), ] streamed._metadata = self._make_result_set_metadata(FIELDS) - BARE = [u"Phred Phlyntstone", 42, True] + BARE = ["Phred Phlyntstone", 42, True] VALUES = [self._make_value(bare) for bare in BARE] streamed._current_row = [] streamed._merge_values(VALUES) @@ -610,13 +610,13 @@ def test_merge_values_empty_and_filled_plus(self): ] streamed._metadata = self._make_result_set_metadata(FIELDS) BARE = [ - u"Phred Phlyntstone", + "Phred Phlyntstone", 42, True, - u"Bharney Rhubble", + "Bharney Rhubble", 39, True, - u"Wylma Phlyntstone", + "Wylma Phlyntstone", ] VALUES = [self._make_value(bare) for bare in BARE] streamed._current_row = [] @@ -635,7 +635,7 @@ def test_merge_values_partial_and_empty(self): self._make_scalar_field("married", TypeCode.BOOL), ] streamed._metadata = self._make_result_set_metadata(FIELDS) - BEFORE = [u"Phred Phlyntstone"] + BEFORE = ["Phred Phlyntstone"] streamed._current_row[:] = BEFORE streamed._merge_values([]) self.assertEqual(list(streamed), []) @@ -652,7 +652,7 @@ def test_merge_values_partial_and_partial(self): self._make_scalar_field("married", TypeCode.BOOL), ] streamed._metadata = self._make_result_set_metadata(FIELDS) - BEFORE = [u"Phred Phlyntstone"] + BEFORE = ["Phred Phlyntstone"] streamed._current_row[:] = BEFORE MERGED = [42] TO_MERGE = [self._make_value(item) for item in MERGED] @@ -671,7 +671,7 @@ def test_merge_values_partial_and_filled(self): self._make_scalar_field("married", TypeCode.BOOL), ] streamed._metadata = self._make_result_set_metadata(FIELDS) - BEFORE = [u"Phred Phlyntstone"] + BEFORE = ["Phred Phlyntstone"] streamed._current_row[:] = BEFORE MERGED = [42, True] TO_MERGE = [self._make_value(item) for item in MERGED] @@ -690,9 +690,9 @@ def test_merge_values_partial_and_filled_plus(self): self._make_scalar_field("married", TypeCode.BOOL), ] streamed._metadata = self._make_result_set_metadata(FIELDS) - BEFORE = [self._make_value(u"Phred Phlyntstone")] + BEFORE = [self._make_value("Phred Phlyntstone")] streamed._current_row[:] = BEFORE - MERGED = [42, True, u"Bharney Rhubble", 39, True, u"Wylma Phlyntstone"] + MERGED = [42, True, "Bharney Rhubble", 39, True, "Wylma Phlyntstone"] TO_MERGE = [self._make_value(item) for item in MERGED] VALUES = BEFORE + MERGED streamed._merge_values(TO_MERGE) @@ -757,7 +757,7 @@ def test_consume_next_first_set_partial(self): self._make_scalar_field("married", TypeCode.BOOL), ] metadata = self._make_result_set_metadata(FIELDS, transaction_id=TXN_ID) - BARE = [u"Phred Phlyntstone", 42] + BARE = ["Phred Phlyntstone", 42] VALUES = [self._make_value(bare) for bare in BARE] result_set = self._make_partial_result_set(VALUES, metadata=metadata) iterator = _MockCancellableIterator(result_set) @@ -779,7 +779,7 @@ def test_consume_next_first_set_partial_existing_txn_id(self): self._make_scalar_field("married", TypeCode.BOOL), ] metadata = self._make_result_set_metadata(FIELDS, transaction_id=b"") - BARE = [u"Phred Phlyntstone", 42] + BARE = ["Phred Phlyntstone", 42] VALUES = [self._make_value(bare) for bare in BARE] result_set = self._make_partial_result_set(VALUES, metadata=metadata) iterator = _MockCancellableIterator(result_set) @@ -799,7 +799,7 @@ def test_consume_next_w_partial_result(self): self._make_scalar_field("age", TypeCode.INT64), self._make_scalar_field("married", TypeCode.BOOL), ] - VALUES = [self._make_value(u"Phred ")] + VALUES = [self._make_value("Phred ")] result_set = self._make_partial_result_set(VALUES, chunked_value=True) iterator = _MockCancellableIterator(result_set) streamed = self._make_one(iterator) @@ -818,24 +818,24 @@ def test_consume_next_w_pending_chunk(self): self._make_scalar_field("married", TypeCode.BOOL), ] BARE = [ - u"Phlyntstone", + "Phlyntstone", 42, True, - u"Bharney Rhubble", + "Bharney Rhubble", 39, True, - u"Wylma Phlyntstone", + "Wylma Phlyntstone", ] VALUES = [self._make_value(bare) for bare in BARE] result_set = self._make_partial_result_set(VALUES) iterator = _MockCancellableIterator(result_set) streamed = self._make_one(iterator) streamed._metadata = self._make_result_set_metadata(FIELDS) - streamed._pending_chunk = self._make_value(u"Phred ") + streamed._pending_chunk = self._make_value("Phred ") streamed._consume_next() self.assertEqual( list(streamed), - [[u"Phred Phlyntstone", BARE[1], BARE[2]], [BARE[3], BARE[4], BARE[5]]], + [["Phred Phlyntstone", BARE[1], BARE[2]], [BARE[3], BARE[4], BARE[5]]], ) self.assertEqual(streamed._current_row, [BARE[6]]) self.assertIsNone(streamed._pending_chunk) @@ -852,7 +852,7 @@ def test_consume_next_last_set(self): stats = self._make_result_set_stats( rows_returned="1", elapsed_time="1.23 secs", cpu_time="0.98 secs" ) - BARE = [u"Phred Phlyntstone", 42, True] + BARE = ["Phred Phlyntstone", 42, True] VALUES = [self._make_value(bare) for bare in BARE] result_set = self._make_partial_result_set(VALUES, stats=stats) iterator = _MockCancellableIterator(result_set) @@ -879,7 +879,7 @@ def test___iter___one_result_set_partial(self): self._make_scalar_field("married", TypeCode.BOOL), ] metadata = self._make_result_set_metadata(FIELDS) - BARE = [u"Phred Phlyntstone", 42] + BARE = ["Phred Phlyntstone", 42] VALUES = [self._make_value(bare) for bare in BARE] for val in VALUES: self.assertIsInstance(val, Value) @@ -902,13 +902,13 @@ def test___iter___multiple_result_sets_filled(self): ] metadata = self._make_result_set_metadata(FIELDS) BARE = [ - u"Phred Phlyntstone", + "Phred Phlyntstone", 42, True, - u"Bharney Rhubble", + "Bharney Rhubble", 39, True, - u"Wylma Phlyntstone", + "Wylma Phlyntstone", 41, True, ] @@ -939,15 +939,15 @@ def test___iter___w_existing_rows_read(self): self._make_scalar_field("married", TypeCode.BOOL), ] metadata = self._make_result_set_metadata(FIELDS) - ALREADY = [[u"Pebbylz Phlyntstone", 4, False], [u"Dino Rhubble", 4, False]] + ALREADY = [["Pebbylz Phlyntstone", 4, False], ["Dino Rhubble", 4, False]] BARE = [ - u"Phred Phlyntstone", + "Phred Phlyntstone", 42, True, - u"Bharney Rhubble", + "Bharney Rhubble", 39, True, - u"Wylma Phlyntstone", + "Wylma Phlyntstone", 41, True, ] @@ -1113,11 +1113,11 @@ def _normalize_int_array(cell): def _normalize_float(cell): - if cell == u"Infinity": + if cell == "Infinity": return float("inf") - if cell == u"-Infinity": + if cell == "-Infinity": return float("-inf") - if cell == u"NaN": + if cell == "NaN": return float("nan") if cell is not None: return float(cell) diff --git a/tests/unit/test_transaction.py b/tests/unit/test_transaction.py index d11a3495fe..d4d9c99c02 100644 --- a/tests/unit/test_transaction.py +++ b/tests/unit/test_transaction.py @@ -388,16 +388,21 @@ def test_commit_w_return_commit_stats(self): self._commit_helper(return_commit_stats=True) def test_commit_w_request_tag_success(self): - request_options = RequestOptions(request_tag="tag-1",) + request_options = RequestOptions( + request_tag="tag-1", + ) self._commit_helper(request_options=request_options) def test_commit_w_transaction_tag_ignored_success(self): - request_options = RequestOptions(transaction_tag="tag-1-1",) + request_options = RequestOptions( + transaction_tag="tag-1-1", + ) self._commit_helper(request_options=request_options) def test_commit_w_request_and_transaction_tag_success(self): request_options = RequestOptions( - request_tag="tag-1", transaction_tag="tag-1-1", + request_tag="tag-1", + transaction_tag="tag-1-1", ) self._commit_helper(request_options=request_options) @@ -545,16 +550,21 @@ def test_execute_update_new_transaction(self): self._execute_update_helper() def test_execute_update_w_request_tag_success(self): - request_options = RequestOptions(request_tag="tag-1",) + request_options = RequestOptions( + request_tag="tag-1", + ) self._execute_update_helper(request_options=request_options) def test_execute_update_w_transaction_tag_success(self): - request_options = RequestOptions(transaction_tag="tag-1-1",) + request_options = RequestOptions( + transaction_tag="tag-1-1", + ) self._execute_update_helper(request_options=request_options) def test_execute_update_w_request_and_transaction_tag_success(self): request_options = RequestOptions( - request_tag="tag-1", transaction_tag="tag-1-1", + request_tag="tag-1", + transaction_tag="tag-1-1", ) self._execute_update_helper(request_options=request_options) @@ -717,16 +727,21 @@ def test_batch_update_wo_errors(self): ) def test_batch_update_w_request_tag_success(self): - request_options = RequestOptions(request_tag="tag-1",) + request_options = RequestOptions( + request_tag="tag-1", + ) self._batch_update_helper(request_options=request_options) def test_batch_update_w_transaction_tag_success(self): - request_options = RequestOptions(transaction_tag="tag-1-1",) + request_options = RequestOptions( + transaction_tag="tag-1-1", + ) self._batch_update_helper(request_options=request_options) def test_batch_update_w_request_and_transaction_tag_success(self): request_options = RequestOptions( - request_tag="tag-1", transaction_tag="tag-1-1", + request_tag="tag-1", + transaction_tag="tag-1-1", ) self._batch_update_helper(request_options=request_options) @@ -874,7 +889,9 @@ def rollback(self, session=None, transaction_id=None, metadata=None): return self._rollback_response def commit( - self, request=None, metadata=None, + self, + request=None, + metadata=None, ): assert not request.single_use_transaction self._committed = (