Skip to content

Commit acf954f

Browse files
ohmayrohmayr
committed
remove legacy code tests
1 parent 55edcab commit acf954f

File tree

1 file changed

+36
-112
lines changed

1 file changed

+36
-112
lines changed

‎tests/unit/test_grpc_helpers.py‎

Lines changed: 36 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -403,16 +403,9 @@ def test_create_channel_implicit(
403403

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

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

417410

418411
@pytest.mark.parametrize(
@@ -462,16 +455,9 @@ def test_create_channel_implicit_with_default_host(
462455
mock.sentinel.credentials, mock.sentinel.Request, default_host=default_host
463456
)
464457

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

476462

477463
@pytest.mark.parametrize(
@@ -504,12 +490,9 @@ def test_create_channel_implicit_with_ssl_creds(
504490
composite_creds_call.assert_called_once_with(ssl_creds, mock.ANY)
505491
composite_creds = composite_creds_call.return_value
506492

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

514497

515498
def test_create_channel_implicit_with_ssl_creds_attempt_direct_path_true():
@@ -542,12 +525,9 @@ def test_create_channel_implicit_with_scopes(
542525

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

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

552532

553533
@mock.patch("grpc.compute_engine_channel_credentials")
@@ -569,12 +549,9 @@ def test_create_channel_implicit_with_default_scopes(
569549

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

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

579556

580557
def test_create_channel_explicit_with_duplicate_credentials():
@@ -603,12 +580,9 @@ def test_create_channel_explicit(grpc_secure_channel, auth_creds, composite_cred
603580

604581
assert channel is grpc_secure_channel.return_value
605582

606-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
607-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
608-
else:
609-
grpc_secure_channel.assert_called_once_with(
610-
target, composite_creds, compression=None
611-
)
583+
grpc_secure_channel.assert_called_once_with(
584+
target, composite_creds, compression=None
585+
)
612586

613587

614588
@mock.patch("grpc.compute_engine_channel_credentials")
@@ -629,12 +603,9 @@ def test_create_channel_explicit_scoped(grpc_secure_channel, composite_creds_cal
629603

630604
assert channel is grpc_secure_channel.return_value
631605

632-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
633-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
634-
else:
635-
grpc_secure_channel.assert_called_once_with(
636-
target, composite_creds, compression=None
637-
)
606+
grpc_secure_channel.assert_called_once_with(
607+
target, composite_creds, compression=None
608+
)
638609

639610

640611
@mock.patch("grpc.compute_engine_channel_credentials")
@@ -659,12 +630,9 @@ def test_create_channel_explicit_default_scopes(
659630

660631
assert channel is grpc_secure_channel.return_value
661632

662-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
663-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
664-
else:
665-
grpc_secure_channel.assert_called_once_with(
666-
target, composite_creds, compression=None
667-
)
633+
grpc_secure_channel.assert_called_once_with(
634+
target, composite_creds, compression=None
635+
)
668636

669637

670638
@mock.patch("grpc.compute_engine_channel_credentials")
@@ -687,12 +655,9 @@ def test_create_channel_explicit_with_quota_project(
687655

688656
assert channel is grpc_secure_channel.return_value
689657

690-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
691-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
692-
else:
693-
grpc_secure_channel.assert_called_once_with(
694-
target, composite_creds, compression=None
695-
)
658+
grpc_secure_channel.assert_called_once_with(
659+
target, composite_creds, compression=None
660+
)
696661

697662

698663
@mock.patch("grpc.compute_engine_channel_credentials")
@@ -718,12 +683,9 @@ def test_create_channel_with_credentials_file(
718683

719684
assert channel is grpc_secure_channel.return_value
720685

721-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
722-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
723-
else:
724-
grpc_secure_channel.assert_called_once_with(
725-
target, composite_creds, compression=None
726-
)
686+
grpc_secure_channel.assert_called_once_with(
687+
target, composite_creds, compression=None
688+
)
727689

728690

729691
@mock.patch("grpc.compute_engine_channel_credentials")
@@ -752,12 +714,9 @@ def test_create_channel_with_credentials_file_and_scopes(
752714

753715
assert channel is grpc_secure_channel.return_value
754716

755-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
756-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
757-
else:
758-
grpc_secure_channel.assert_called_once_with(
759-
target, composite_creds, compression=None
760-
)
717+
grpc_secure_channel.assert_called_once_with(
718+
target, composite_creds, compression=None
719+
)
761720

762721

763722
@mock.patch("grpc.compute_engine_channel_credentials")
@@ -786,44 +745,9 @@ def test_create_channel_with_credentials_file_and_default_scopes(
786745

787746
assert channel is grpc_secure_channel.return_value
788747

789-
if grpc_helpers.HAS_GRPC_GCP: # pragma: NO COVER
790-
grpc_secure_channel.assert_called_once_with(target, composite_creds, None)
791-
else:
792-
grpc_secure_channel.assert_called_once_with(
793-
target, composite_creds, compression=None
794-
)
795-
796-
797-
@pytest.mark.skipif(
798-
not grpc_helpers.HAS_GRPC_GCP, reason="grpc_gcp module not available"
799-
)
800-
@mock.patch("grpc_gcp.secure_channel")
801-
def test_create_channel_with_grpc_gcp(grpc_gcp_secure_channel): # pragma: NO COVER
802-
target = "example.com:443"
803-
scopes = ["test_scope"]
804-
805-
credentials = mock.create_autospec(google.auth.credentials.Scoped, instance=True)
806-
credentials.requires_scopes = True
807-
808-
grpc_helpers.create_channel(target, credentials=credentials, scopes=scopes)
809-
grpc_gcp_secure_channel.assert_called()
810-
811-
credentials.with_scopes.assert_called_once_with(scopes, default_scopes=None)
812-
813-
814-
@pytest.mark.skipif(grpc_helpers.HAS_GRPC_GCP, reason="grpc_gcp module not available")
815-
@mock.patch("grpc.secure_channel")
816-
def test_create_channel_without_grpc_gcp(grpc_secure_channel):
817-
target = "example.com:443"
818-
scopes = ["test_scope"]
819-
820-
credentials = mock.create_autospec(google.auth.credentials.Scoped, instance=True)
821-
credentials.requires_scopes = True
822-
823-
grpc_helpers.create_channel(target, credentials=credentials, scopes=scopes)
824-
grpc_secure_channel.assert_called()
825-
826-
credentials.with_scopes.assert_called_once_with(scopes, default_scopes=None)
748+
grpc_secure_channel.assert_called_once_with(
749+
target, composite_creds, compression=None
750+
)
827751

828752

829753
class TestChannelStub(object):

0 commit comments

Comments
 (0)