From bb75e97b72a14847d1de1d27ecb3d9c3c9f5b9f4 Mon Sep 17 00:00:00 2001 From: larkee Date: Fri, 5 Feb 2021 13:49:48 +1100 Subject: [PATCH 1/2] test: fix credential scope assertions --- tests/unit/test_client.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/test_client.py b/tests/unit/test_client.py index 9c260c5f95..44145954bc 100644 --- a/tests/unit/test_client.py +++ b/tests/unit/test_client.py @@ -88,7 +88,7 @@ def _constructor_test_helper( self.assertIs(client._credentials, expected_creds) if expected_scopes is not None: - creds.with_scopes.assert_called_once_with(expected_scopes) + creds.with_scopes.assert_called_once_with(expected_scopes, default_scopes=None) self.assertEqual(client.project, self.PROJECT) self.assertIs(client._client_info, expected_client_info) @@ -235,7 +235,7 @@ def test_instance_admin_api(self, mock_em): credentials=mock.ANY, client_info=client_info, client_options=client_options ) - credentials.with_scopes.assert_called_once_with(expected_scopes) + credentials.with_scopes.assert_called_once_with(expected_scopes, default_scopes=None) @mock.patch("google.cloud.spanner_v1.client._get_spanner_emulator_host") def test_instance_admin_api_emulator_env(self, mock_em): @@ -333,7 +333,7 @@ def test_database_admin_api(self, mock_em): credentials=mock.ANY, client_info=client_info, client_options=client_options ) - credentials.with_scopes.assert_called_once_with(expected_scopes) + credentials.with_scopes.assert_called_once_with(expected_scopes, default_scopes=None) @mock.patch("google.cloud.spanner_v1.client._get_spanner_emulator_host") def test_database_admin_api_emulator_env(self, mock_em): From 1a9190ccd1eb60752dc0a61c67b6c02f09ab7b75 Mon Sep 17 00:00:00 2001 From: larkee Date: Fri, 5 Feb 2021 14:48:56 +1100 Subject: [PATCH 2/2] style: fix lint --- tests/unit/test_client.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/unit/test_client.py b/tests/unit/test_client.py index 44145954bc..40d10de9df 100644 --- a/tests/unit/test_client.py +++ b/tests/unit/test_client.py @@ -88,7 +88,9 @@ def _constructor_test_helper( self.assertIs(client._credentials, expected_creds) if expected_scopes is not None: - creds.with_scopes.assert_called_once_with(expected_scopes, default_scopes=None) + creds.with_scopes.assert_called_once_with( + expected_scopes, default_scopes=None + ) self.assertEqual(client.project, self.PROJECT) self.assertIs(client._client_info, expected_client_info) @@ -235,7 +237,9 @@ def test_instance_admin_api(self, mock_em): credentials=mock.ANY, client_info=client_info, client_options=client_options ) - credentials.with_scopes.assert_called_once_with(expected_scopes, default_scopes=None) + credentials.with_scopes.assert_called_once_with( + expected_scopes, default_scopes=None + ) @mock.patch("google.cloud.spanner_v1.client._get_spanner_emulator_host") def test_instance_admin_api_emulator_env(self, mock_em): @@ -333,7 +337,9 @@ def test_database_admin_api(self, mock_em): credentials=mock.ANY, client_info=client_info, client_options=client_options ) - credentials.with_scopes.assert_called_once_with(expected_scopes, default_scopes=None) + credentials.with_scopes.assert_called_once_with( + expected_scopes, default_scopes=None + ) @mock.patch("google.cloud.spanner_v1.client._get_spanner_emulator_host") def test_database_admin_api_emulator_env(self, mock_em):