cleanup

Author: ohmayr

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

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import grpc
+from packaging.version import Version
 import pytest
 from google import showcase
 
@@ -22,17 +24,7 @@ def run_pqc_test(use_mtls):
         pytest.skip("PQC integration test requires mTLS (--mtls flag) to be enabled.")
 
 
-def _require_pqc_support(transport_name):
-    # TODO(Phase 3): Remove this check once grpcio >= 1.83.0 is enforced across all client libraries.
-    if transport_name == "grpc":
-        import grpc
-        from packaging.version import Version
-        if Version(grpc.__version__) < Version("1.83.0rc0"):
-            pytest.skip(f"gRPC PQC negotiation requires grpcio >= 1.83.0 (current: {grpc.__version__})")
-
-
 def _verify_pqc_negotiated_group(client, interceptor, transport_name):
-    _require_pqc_support(transport_name)
     # Make secure call using standard GAPIC client library fixture
     response = client.echo(request=showcase.EchoRequest(content="Verify PQC connection."))
     assert response.content == "Verify PQC connection."
@@ -59,6 +51,10 @@ def _verify_pqc_negotiated_group(client, interceptor, transport_name):
 
 def test_pqc_grpc(run_pqc_test, intercepted_echo_grpc):
     """Verifies that the gRPC client library negotiates PQC (X25519MLKEM768) with Showcase server."""
+    # TODO(Phase 3): Remove this check once grpcio >= 1.83.0 is enforced across all client libraries.
+    if Version(grpc.__version__) < Version("1.83.0rc0"):
+        pytest.skip(f"gRPC PQC negotiation requires grpcio >= 1.83.0 (current: {grpc.__version__})")
+
     client, interceptor = intercepted_echo_grpc
     _verify_pqc_negotiated_group(client, interceptor, "grpc")
 
@@ -68,3 +64,4 @@ def test_pqc_rest(run_pqc_test, intercepted_echo_rest):
     client, interceptor = intercepted_echo_rest
     _verify_pqc_negotiated_group(client, interceptor, "rest")
 
+