Skip to content
This repository was archived by the owner on Feb 17, 2026. It is now read-only.

Commit 9f87d10

Browse files
vchudnov-gvchudnov-g
committed
chore: clean up HAS_GRPC_GCP
1 parent e4856d6 commit 9f87d10

File tree

1 file changed

+36
-98
lines changed

1 file changed

+36
-98
lines changed

‎tests/unit/test_grpc_helpers.py‎

Lines changed: 36 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -404,16 +404,9 @@ def test_create_channel_implicit(
404404

405405
google_auth_default.assert_called_once_with(scopes=None, default_scopes=None)
406406

407-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
408-
# The original target is the expected target
409-
expected_target = target
410-
grpc_secure_channel.assert_called_once_with(
411-
expected_target, composite_creds, None
412-
)
413-
else:
414-
grpc_secure_channel.assert_called_once_with(
415-
expected_target, composite_creds, compression=grpc.Compression.Gzip
416-
)
407+
grpc_secure_channel.assert_called_once_with(
408+
expected_target, composite_creds, compression=grpc.Compression.Gzip
409+
)
417410

418411

419412
@pytest.mark.parametrize(
@@ -463,16 +456,9 @@ def test_create_channel_implicit_with_default_host(
463456
mock.sentinel.credentials, mock.sentinel.Request, default_host=default_host
464457
)
465458

466-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
467-
# The original target is the expected target
468-
expected_target = target
469-
grpc_secure_channel.assert_called_once_with(
470-
expected_target, composite_creds, None
471-
)
472-
else:
473-
grpc_secure_channel.assert_called_once_with(
474-
expected_target, composite_creds, compression=None
475-
)
459+
grpc_secure_channel.assert_called_once_with(
460+
expected_target, composite_creds, compression=None
461+
)
476462

477463

478464
@pytest.mark.parametrize(
@@ -505,12 +491,9 @@ def test_create_channel_implicit_with_ssl_creds(
505491
composite_creds_call.assert_called_once_with(ssl_creds, mock.ANY)
506492
composite_creds = composite_creds_call.return_value
507493

508-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
509-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
510-
else:
511-
grpc_secure_channel.assert_called_once_with(
512-
target, composite_creds, compression=None
513-
)
494+
grpc_secure_channel.assert_called_once_with(
495+
target, composite_creds, compression=None
496+
)
514497

515498

516499
def test_create_channel_implicit_with_ssl_creds_attempt_direct_path_true():
@@ -543,12 +526,9 @@ def test_create_channel_implicit_with_scopes(
543526

544527
default.assert_called_once_with(scopes=["one", "two"], default_scopes=None)
545528

546-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
547-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
548-
else:
549-
grpc_secure_channel.assert_called_once_with(
550-
target, composite_creds, compression=None
551-
)
529+
grpc_secure_channel.assert_called_once_with(
530+
target, composite_creds, compression=None
531+
)
552532

553533

554534
@mock.patch("grpc.compute_engine_channel_credentials")
@@ -570,12 +550,9 @@ def test_create_channel_implicit_with_default_scopes(
570550

571551
default.assert_called_once_with(scopes=None, default_scopes=["three", "four"])
572552

573-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
574-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
575-
else:
576-
grpc_secure_channel.assert_called_once_with(
577-
target, composite_creds, compression=None
578-
)
553+
grpc_secure_channel.assert_called_once_with(
554+
target, composite_creds, compression=None
555+
)
579556

580557

581558
def test_create_channel_explicit_with_duplicate_credentials():
@@ -605,12 +582,9 @@ def test_create_channel_explicit(grpc_secure_channel, auth_creds, composite_cred
605582

606583
assert channel is grpc_secure_channel.return_value
607584

608-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
609-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
610-
else:
611-
grpc_secure_channel.assert_called_once_with(
612-
target, composite_creds, compression=None
613-
)
585+
grpc_secure_channel.assert_called_once_with(
586+
target, composite_creds, compression=None
587+
)
614588

615589

616590
@mock.patch("grpc.compute_engine_channel_credentials")
@@ -631,12 +605,9 @@ def test_create_channel_explicit_scoped(grpc_secure_channel, composite_creds_cal
631605

632606
assert channel is grpc_secure_channel.return_value
633607

634-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
635-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
636-
else:
637-
grpc_secure_channel.assert_called_once_with(
638-
target, composite_creds, compression=None
639-
)
608+
grpc_secure_channel.assert_called_once_with(
609+
target, composite_creds, compression=None
610+
)
640611

641612

642613
@mock.patch("grpc.compute_engine_channel_credentials")
@@ -661,12 +632,9 @@ def test_create_channel_explicit_default_scopes(
661632

662633
assert channel is grpc_secure_channel.return_value
663634

664-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
665-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
666-
else:
667-
grpc_secure_channel.assert_called_once_with(
668-
target, composite_creds, compression=None
669-
)
635+
grpc_secure_channel.assert_called_once_with(
636+
target, composite_creds, compression=None
637+
)
670638

671639

672640
@mock.patch("grpc.compute_engine_channel_credentials")
@@ -689,12 +657,9 @@ def test_create_channel_explicit_with_quota_project(
689657

690658
assert channel is grpc_secure_channel.return_value
691659

692-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
693-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
694-
else:
695-
grpc_secure_channel.assert_called_once_with(
696-
target, composite_creds, compression=None
697-
)
660+
grpc_secure_channel.assert_called_once_with(
661+
target, composite_creds, compression=None
662+
)
698663

699664

700665
@mock.patch("grpc.compute_engine_channel_credentials")
@@ -721,12 +686,9 @@ def test_create_channel_with_credentials_file(
721686

722687
assert channel is grpc_secure_channel.return_value
723688

724-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
725-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
726-
else:
727-
grpc_secure_channel.assert_called_once_with(
728-
target, composite_creds, compression=None
729-
)
689+
grpc_secure_channel.assert_called_once_with(
690+
target, composite_creds, compression=None
691+
)
730692

731693

732694
@mock.patch("grpc.compute_engine_channel_credentials")
@@ -756,12 +718,9 @@ def test_create_channel_with_credentials_file_and_scopes(
756718

757719
assert channel is grpc_secure_channel.return_value
758720

759-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
760-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
761-
else:
762-
grpc_secure_channel.assert_called_once_with(
763-
target, composite_creds, compression=None
764-
)
721+
grpc_secure_channel.assert_called_once_with(
722+
target, composite_creds, compression=None
723+
)
765724

766725

767726
@mock.patch("grpc.compute_engine_channel_credentials")
@@ -791,32 +750,11 @@ def test_create_channel_with_credentials_file_and_default_scopes(
791750

792751
assert channel is grpc_secure_channel.return_value
793752

794-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
795-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
796-
else:
797-
grpc_secure_channel.assert_called_once_with(
798-
target, composite_creds, compression=None
799-
)
800-
801-
802-
@pytest.mark.skipif(
803-
not grpc_helpers.HAS_GRPC_GCP, reason="grpc_gcp module not available"
804-
)
805-
@mock.patch("grpc_gcp.secure_channel")
806-
def test_create_channel_with_grpc_gcp(grpc_gcp_secure_channel): # pragma: NO COVER
807-
target = "example.com:443"
808-
scopes = ["test_scope"]
809-
810-
credentials = mock.create_autospec(google.auth.credentials.Scoped, instance=True)
811-
credentials.requires_scopes = True
812-
813-
grpc_helpers.create_channel(target, credentials=credentials, scopes=scopes)
814-
grpc_gcp_secure_channel.assert_called()
815-
816-
credentials.with_scopes.assert_called_once_with(scopes, default_scopes=None)
753+
grpc_secure_channel.assert_called_once_with(
754+
target, composite_creds, compression=None
755+
)
817756

818757

819-
@pytest.mark.skipif(grpc_helpers.HAS_GRPC_GCP, reason="grpc_gcp module not available")
820758
@mock.patch("grpc.secure_channel")
821759
def test_create_channel_without_grpc_gcp(grpc_secure_channel):
822760
target = "example.com:443"

0 commit comments

Comments
 (0)