cleanup

Author: ohmayr

packages/gapic-generator/tests/system/conftest.py

@@ -424,7 +424,7 @@ async def intercept_stream_stream(
 
 
 @pytest.fixture
-def intercepted_echo_grpc(use_mtls, use_tls):
+def intercepted_echo_grpc(use_tls):
     # The interceptor adds 'showcase-trailer' client metadata. Showcase server
     # echoes any metadata with key 'showcase-trailer', so the same metadata
     # should appear as trailing metadata in the response.
@@ -433,12 +433,11 @@ def intercepted_echo_grpc(use_mtls, use_tls):
         "intercepted",
     )
     host = "localhost:7469"
-    if use_mtls:
-        channel = grpc.secure_channel(host, ssl_credentials)
-    elif use_tls:
-        channel = grpc.secure_channel(host, tls_credentials)
-    else:
-        channel = grpc.insecure_channel(host)
+    channel = (
+        grpc.secure_channel(host, tls_credentials)
+        if use_tls
+        else grpc.insecure_channel(host)
+    )
     intercept_channel = grpc.intercept_channel(channel, interceptor)
     transport = EchoClient.get_transport_class("grpc")(
         credentials=ga_credentials.AnonymousCredentials(),
@@ -448,7 +447,7 @@ def intercepted_echo_grpc(use_mtls, use_tls):
 
 
 @pytest_asyncio.fixture
-async def intercepted_echo_grpc_async(use_mtls, use_tls):
+async def intercepted_echo_grpc_async(use_tls):
     # The interceptor adds 'showcase-trailer' client metadata. Showcase server
     # echoes any metadata with key 'showcase-trailer', so the same metadata
     # should appear as trailing metadata in the response.
@@ -457,12 +456,11 @@ async def intercepted_echo_grpc_async(use_mtls, use_tls):
         "intercepted",
     )
     host = "localhost:7469"
-    if use_mtls:
-        channel = grpc.aio.secure_channel(host, ssl_credentials, interceptors=[interceptor])
-    elif use_tls:
-        channel = grpc.aio.secure_channel(host, tls_credentials, interceptors=[interceptor])
-    else:
-        channel = grpc.aio.insecure_channel(host, interceptors=[interceptor])
+    channel = (
+        grpc.aio.secure_channel(host, tls_credentials, interceptors=[interceptor])
+        if use_tls
+        else grpc.aio.insecure_channel(host, interceptors=[interceptor])
+    )
     transport = EchoAsyncClient.get_transport_class("grpc_asyncio")(
         credentials=ga_credentials.AnonymousCredentials(),
         channel=channel,
@@ -478,23 +476,21 @@ def cert_verify(self, conn, url, verify, cert):
 
 
 @pytest.fixture
-def intercepted_echo_rest(use_mtls, use_tls):
+def intercepted_echo_rest(use_tls):
     transport_name = "rest"
     transport_cls = EchoClient.get_transport_class(transport_name)
     interceptor = EchoMetadataClientRestInterceptor()
 
-    url_scheme = "https" if (use_mtls or use_tls) else "http"
+    url_scheme = "https" if use_tls else "http"
     transport = transport_cls(
         credentials=ga_credentials.AnonymousCredentials(),
         host="localhost:7469",
         url_scheme=url_scheme,
         interceptor=interceptor,
     )
-    if use_mtls or use_tls:
+    if use_tls:
         transport._session.verify = CERT_PATH
         transport._session.mount("https://", HostNameIgnoringAdapter())
-    if use_mtls:
-        transport._session.cert = (CERT_PATH, KEY_PATH)
 
     return EchoClient(transport=transport), interceptor
 

packages/gapic-generator/tests/system/test_pqc.py

@@ -18,10 +18,10 @@
 from google import showcase
 
 
-@pytest.fixture
-def run_pqc_test(use_tls):
+@pytest.fixture(autouse=True)
+def require_tls(use_tls):
     if not use_tls:
-        pytest.skip("PQC integration test requires TLS (--tls or --mtls flag) to be enabled.")
+        pytest.skip("PQC integration test requires standard TLS (--tls flag) to be enabled.")
 
 
 def _verify_pqc_metadata(interceptor, transport_name):
@@ -40,7 +40,7 @@ def _verify_pqc_metadata(interceptor, transport_name):
     ), f"Failed: {transport_name} Connection is NOT PQC-compliant! Negotiated: {negotiated_group}"
 
 
-def test_pqc_grpc(run_pqc_test, intercepted_echo_grpc):
+def test_pqc_grpc(intercepted_echo_grpc):
     """Verifies that the gRPC client library negotiates PQC (X25519MLKEM768) with Showcase server."""
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17752):
     # Remove this check once grpcio >= 1.83.0 is enforced across all client libraries.
@@ -55,7 +55,7 @@ def test_pqc_grpc(run_pqc_test, intercepted_echo_grpc):
     _verify_pqc_metadata(interceptor, "grpc")
 
 
-def test_pqc_rest(run_pqc_test, intercepted_echo_rest):
+def test_pqc_rest(intercepted_echo_rest):
     """Verifies that the REST client library negotiates PQC (X25519MLKEM768) with Showcase server."""
     client, interceptor = intercepted_echo_rest
     response = client.echo(request=showcase.EchoRequest(content="Verify PQC connection."))
@@ -64,20 +64,20 @@ def test_pqc_rest(run_pqc_test, intercepted_echo_rest):
 
 
 @pytest.mark.asyncio
-async def test_pqc_grpc_async(run_pqc_test, intercepted_echo_grpc_async):
+async def test_pqc_grpc_async(intercepted_echo_grpc_async):
     """Verifies that the async gRPC client library negotiates PQC (X25519MLKEM768) with Showcase server."""
     # TODO(https://github.com/googleapis/google-cloud-python/issues/17752):
     # Remove this check once grpcio >= 1.83.0 is enforced across all client libraries.
     if Version(grpc.__version__) < Version("1.83.0rc0"):
-        # TODO(https://github.com/googleapis/google-cloud-python/issues/17751): 
+        # TODO(https://github.com/googleapis/google-cloud-python/issues/17751):
         # Update the version in the check above to `1.83.0` once released.
-        pytest.skip(f"gRPC PQC negotiation requires grpcio >= 1.83.0 (current: {grpc.__version__})")
+        pytest.skip(
+            f"gRPC PQC negotiation requires grpcio >= 1.83.0 (current: {grpc.__version__})"
+        )
 
     client, interceptor = intercepted_echo_grpc_async
-    response = await client.echo(request=showcase.EchoRequest(content="Verify PQC connection."))
+    response = await client.echo(
+        request=showcase.EchoRequest(content="Verify PQC connection.")
+    )
     assert response.content == "Verify PQC connection."
     _verify_pqc_metadata(interceptor, "grpc_asyncio")
-
-
-
-