8000 test: test default_host · googleapis/python-api-core@02de988 · GitHub
[go: up one dir, main page]
Skip to content

Commit 02de988

Browse files
busunkim96busunkim96
committed
test: test default_host
1 parent 4cd74e4 commit 02de988

File tree

3 files changed

+64
-10
lines changed

3 files changed

+64
-10
lines changed

‎google/api_core/grpc_helpers.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,7 @@ def _create_composite_credentials(
183183
scopes=None,
184184
ssl_credentials=None,
185185
quota_project_id=None,
186-
default_host=None
187-
):
186+
default_host=None):
188187
"""Create the composite credentials for secure channels.
189188
190189
Args:
@@ -216,13 +215,18 @@ def _create_composite_credentials(
216215
"'credentials' and 'credentials_file' are mutually exclusive."
217216
)
218217

219-
220218
if credentials_file:
221-
credentials, _ = google.auth.load_credentials_from_file(credentials_file,
222-
scopes=scopes, default_scopes=default_scopes)
219+
credentials, _ = google.auth.load_credentials_from_file(
220+
credentials_file,
221+
scopes=scopes,
222+
default_scopes=default_scopes
223+
)
223224
elif credentials:
224-
credentials = google.auth.credentials.with_scopes_if_required(credentials,
225-
scopes=scopes, default_scopes=default_scopes)
225+
credentials = google.auth.credentials.with_scopes_if_required(
226+
credentials,
227+
scopes=scopes,
228+
default_scopes=default_scopes
229+
)
226230
else:
227231
credentials, _ = google.auth.default(scopes=scopes, default_scopes=default_scopes)
228232

‎tests/asyncio/test_grpc_helpers_async.py

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,30 @@ def test_create_channel_implicit(grpc_secure_channel, default, composite_creds_c
277277
grpc_secure_channel.assert_called_once_with(target, composite_creds)
278278

279279

280+
@mock.patch("google.auth.transport.grpc.AuthMetadataPlugin")
281+
@mock.patch(
282+
"google.auth.transport.requests.Request",
283+
return_value=mock.sentinel.Request
284+
)
285+
@mock.patch("grpc.composite_channel_credentials")
286+
@mock.patch(
287+
"google.auth.default",
288+
return_value=(mock.sentinel.credentials, mock.sentinel.projet),
289+
)
290+
@mock.patch("grpc.experimental.aio.secure_channel")
291+
def test_create_channel_implicit_with_default_host(grpc_secure_channel, default, composite_creds_call, request, auth_metadata_plugin):
292+
target = "example.com:443"
293+
default_host = "example.com"
294+
composite_creds = composite_creds_call.return_value
295+
296+
channel = grpc_helpers_async.create_channel(target, default_host=default_host)
297+
298+
assert channel is grpc_secure_channel.return_value
299+
default.assert_called_once_with(scopes=None, default_scopes=None)
300+
auth_metadata_plugin.assert_called_once_with(mock.sentinel.credentials, mock.sentinel.Request, default_host=default_host)
301+
grpc_secure_channel.assert_called_once_with(target, composite_creds)
302+
303+
280304
@mock.patch("grpc.composite_channel_credentials")
281305
@mock.patch(
282306
"google.auth.default",
@@ -402,7 +426,6 @@ def test_create_channel_explicit_default_scopes(grpc_secure_channel, composite_c
402426
grpc_secure_channel.assert_called_once_with(target, composite_creds)
403427

404428

405-
406429
@mock.patch("grpc.composite_channel_credentials")
407430
@mock.patch("grpc.experimental.aio.secure_channel")
408431
def test_create_channel_explicit_with_quota_project(grpc_secure_channel, composite_creds_call):

‎tests/unit/test_grpc_helpers.py

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,34 @@ def test_create_channel_implicit(grpc_secure_channel, default, composite_creds_c
239239
grpc_secure_channel.assert_called_once_with(target, composite_creds)
240240

241241

242+
@mock.patch("google.auth.transport.grpc.AuthMetadataPlugin")
243+
@mock.patch(
244+
"google.auth.transport.requests.Request",
245+
return_value=mock.sentinel.Request
246+
)
247+
@mock.patch("grpc.composite_channel_credentials")
248+
@mock.patch(
249+
"google.auth.default",
250+
return_value=(mock.sentinel.credentials, mock.sentinel.project),
251+
)
252+
@mock.patch("grpc.secure_channel")
253+
def test_create_channel_implicit_with_default_host(grpc_secure_channel, default, composite_creds_call, request, auth_metadata_plugin):
254+
target = "example.com:443"
255+
default_host = "example.com"
256+
composite_creds = composite_creds_call.return_value
257+
258+
channel = grpc_helpers.create_channel(target, default_host=default_host)
259+
260+
assert channel is grpc_secure_channel.return_value
261+
default.assert_called_once_with(scopes=None, default_scopes=None)
262+
auth_metadata_plugin.assert_called_once_with(mock.sentinel.credentials, mock.sentinel.Request, default_host=default_host)
263+
264+
if grpc_helpers.HAS_GRPC_GCP:
265+
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
266+
else:
267+
grpc_secure_channel.assert_called_once_with(target, composite_creds)
268+
269+
242270
@mock.patch("grpc.composite_channel_credentials")
243271
@mock.patch(
244272
"google.auth.default",
@@ -355,7 +383,7 @@ def test_create_channel_explicit_scoped(grpc_secure_channel, composite_creds_cal
355383
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
356384
else:
357385
grpc_secure_channel.assert_called_once_with(target, composite_creds)
358-
386+
359387

360388
@mock.patch("grpc.composite_channel_credentials")
361389
@mock.patch("grpc.secure_channel")
@@ -479,7 +507,6 @@ def test_create_channel_with_credentials_file_and_default_scopes(load_credential
479507
grpc_secure_channel.assert_called_once_with(target, composite_creds)
480508

481509

482-
483510
@pytest.mark.skipif(
484511
not grpc_helpers.HAS_GRPC_GCP, reason="grpc_gcp module not available"
485512
)

0 commit comments

Comments
 (0)
0