address feedback

Author: ohmayr

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

@@ -115,10 +115,10 @@ def async_identity(use_mtls, request, event_loop):
         )
 
 
-dir = os.path.dirname(__file__)
-with open(os.path.join(dir, "../cert/mtls.crt"), "rb") as fh:
+base_dir = os.path.dirname(__file__)
+with open(os.path.join(base_dir, "../cert/mtls.crt"), "rb") as fh:
     cert = fh.read()
-with open(os.path.join(dir, "../cert/mtls.key"), "rb") as fh:
+with open(os.path.join(base_dir, "../cert/mtls.key"), "rb") as fh:
     key = fh.read()
 
 ssl_credentials = grpc.ssl_channel_credentials(
@@ -481,9 +481,9 @@ def intercepted_echo_rest(use_mtls):
         interceptor=interceptor,
     )
     if use_mtls:
-        dir = os.path.dirname(__file__)
-        cert_path = os.path.join(dir, "../cert/mtls.crt")
-        key_path = os.path.join(dir, "../cert/mtls.key")
+        base_dir = os.path.dirname(__file__)
+        cert_path = os.path.join(base_dir, "../cert/mtls.crt")
+        key_path = os.path.join(base_dir, "../cert/mtls.key")
         transport._session.verify = cert_path
         transport._session.cert = (cert_path, key_path)
         transport._session.mount("https://", HostNameIgnoringAdapter())
@@ -508,9 +508,9 @@ def intercepted_echo_rest_async(use_mtls):
         interceptor=interceptor,
     )
     if use_mtls:
-        dir = os.path.dirname(__file__)
-        cert_path = os.path.join(dir, "../cert/mtls.crt")
-        key_path = os.path.join(dir, "../cert/mtls.key")
+        base_dir = os.path.dirname(__file__)
+        cert_path = os.path.join(base_dir, "../cert/mtls.crt")
+        key_path = os.path.join(base_dir, "../cert/mtls.key")
         transport._session.verify = cert_path
         transport._session.cert = (cert_path, key_path)
         transport._session.mount("https://", HostNameIgnoringAdapter())

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

@@ -30,13 +30,10 @@ def _verify_pqc_negotiated_group(client, interceptor, transport_name):
     assert response.content == "Verify PQC connection."
 
     # Extract negotiated group and supported groups from response headers
-    negotiated_group = None
-    supported_groups = None
-    for key, value in interceptor.response_metadata:
-        if key.lower() == "x-showcase-tls-group":
-            negotiated_group = value
-        elif key.lower() == "x-showcase-tls-client-supported-groups":
-            supported_groups = value
+    response_metadata = getattr(interceptor, "response_metadata", []) or []
+    headers = {key.lower(): value for key, value in response_metadata}
+    negotiated_group = headers.get("x-showcase-tls-group")
+    supported_groups = headers.get("x-showcase-tls-client-supported-groups")
 
     assert negotiated_group is not None, "Failed: Showcase server did not return negotiated TLS group header."
     assert supported_groups is not None, "Failed: Showcase server did not return client advertised supported groups."