Auto-use check_for_otdfctl fixture

Author: b-long

tests/support_otdfctl.py

@@ -1,18 +1,28 @@
 import subprocess
+import pytest
 
 
+@pytest.mark.integration
+@pytest.fixture(scope="session", autouse=True)
 def check_for_otdfctl():
-    # TODO Consider setting GRPC_ENFORCE_ALPN_ENABLED to false if issues arise
-    # original_env = os.environ.copy()
-    # original_env["GRPC_ENFORCE_ALPN_ENABLED"] = "false"
+    """
+    Ensure that the otdfctl command is available on the system.
+
+    This fixture runs once per test session (for integration tests) and raises
+    an exception if the otdfctl command is not found.
+    """
+
+    # TODO Consider setting GRPC_ENFORCE_ALPN_ENABLED to false as needed
+    # test_env = os.environ.copy()
+    # test_env["GRPC_ENFORCE_ALPN_ENABLED"] = "false"
 
     # Check if otdfctl is available
     try:
         subprocess.run(
             ["otdfctl", "--version"],
             capture_output=True,
             check=True,
-            # env=original_env
+            # env=test_env
         )
     except (subprocess.CalledProcessError, FileNotFoundError):
         raise Exception(

tests/test_cli.py

@@ -10,7 +10,6 @@
 import json
 from pathlib import Path
 from tests.config_pydantic import CONFIG_TDF
-from tests.support_otdfctl import check_for_otdfctl
 
 
 def test_cli_help():
@@ -181,8 +180,6 @@ def test_cli_encrypt_integration():
             "OPENTDF_PLATFORM_URL must be set in config for integration tests"
         )
 
-    check_for_otdfctl()
-
     # Create temporary directory for work
     with tempfile.TemporaryDirectory() as temp_dir:
         temp_path = Path(temp_dir)

tests/test_cli_comparison.py

@@ -8,7 +8,6 @@
 import json
 from pathlib import Path
 from tests.config_pydantic import CONFIG_TDF
-from tests.support_otdfctl import check_for_otdfctl
 
 # Fail fast if OPENTDF_PLATFORM_URL is not set
 platform_url = CONFIG_TDF.OPENTDF_PLATFORM_URL
@@ -20,8 +19,6 @@
 def test_otdfctl_encrypt_python_decrypt(collect_server_logs):
     """Integration test that uses otdfctl for encryption and the Python CLI for decryption"""
 
-    check_for_otdfctl()
-
     # Create temporary directory for work
     with tempfile.TemporaryDirectory() as temp_dir:
         temp_path = Path(temp_dir)
@@ -197,8 +194,6 @@ def test_otdfctl_encrypt_python_decrypt(collect_server_logs):
 def test_otdfctl_encrypt_otdfctl_decrypt(collect_server_logs):
     """Integration test that uses otdfctl for both encryption and decryption to verify roundtrip functionality"""
 
-    check_for_otdfctl()
-
     # Create temporary directory for work
     with tempfile.TemporaryDirectory() as temp_dir:
         temp_path = Path(temp_dir)

tests/test_cli_encrypt_only.py

@@ -12,7 +12,6 @@
 import zipfile
 import os
 import sys
-from tests.support_otdfctl import check_for_otdfctl
 
 original_env = os.environ.copy()
 original_env["GRPC_ENFORCE_ALPN_ENABLED"] = "false"
@@ -314,7 +313,6 @@ def _run_otdfctl_inspect(
 @pytest.mark.integration
 def test_otdfctl_encrypt(collect_server_logs):
     """Integration test that uses otdfctl for encryption only and verifies the TDF can be inspected"""
-    check_for_otdfctl()
 
     # Create temporary directory for work
     with tempfile.TemporaryDirectory() as temp_dir:
@@ -373,7 +371,6 @@ def test_otdfctl_encrypt(collect_server_logs):
 @pytest.mark.integration
 def test_python_encrypt(collect_server_logs):
     """Integration test that uses Python CLI for encryption only and verifies the TDF can be inspected"""
-    check_for_otdfctl()
 
     # Create temporary directory for work
     with tempfile.TemporaryDirectory() as temp_dir:

tests/test_cli_roundtrip.py

@@ -11,7 +11,6 @@
 from tests.config_pydantic import CONFIG_TDF
 import os
 
-from tests.support_otdfctl import check_for_otdfctl
 
 original_env = os.environ.copy()
 original_env["GRPC_ENFORCE_ALPN_ENABLED"] = "false"
@@ -28,8 +27,6 @@ def test_cli_decrypt_otdfctl_tdf():
     Test that the Python CLI can successfully decrypt TDF files created by otdfctl.
     """
 
-    check_for_otdfctl()
-
     # Create temporary directory for work
     with tempfile.TemporaryDirectory() as temp_dir:
         temp_path = Path(temp_dir)
@@ -134,7 +131,6 @@ def test_otdfctl_decrypt_comparison(collect_server_logs):
     """
     Test comparative decryption between otdfctl and Python CLI on the same TDF.
     """
-    check_for_otdfctl()
 
     # Create temporary directory for work
     with tempfile.TemporaryDirectory() as temp_dir:
@@ -305,8 +301,6 @@ def test_otdfctl_encrypt_decrypt_roundtrip(collect_server_logs):
     Test complete encrypt-decrypt roundtrip using otdfctl to verify functionality.
     """
 
-    check_for_otdfctl()
-
     # Create temporary directory for work
     with tempfile.TemporaryDirectory() as temp_dir:
         temp_path = Path(temp_dir)

tests/test_tdf_reader_integration.py

@@ -13,7 +13,6 @@
     TDFReader,
 )
 from tests.config_pydantic import CONFIG_TDF
-from tests.support_otdfctl import check_for_otdfctl
 
 # Fail fast if OPENTDF_PLATFORM_URL is not set
 platform_url = CONFIG_TDF.OPENTDF_PLATFORM_URL
@@ -28,8 +27,6 @@ class TestTDFReaderIntegration:
     def test_read_otdfctl_created_tdf_structure(self):
         """Test that TDFReader can parse the structure of files created by otdfctl."""
 
-        check_for_otdfctl()
-
         # Create temporary directory for work
         with tempfile.TemporaryDirectory() as temp_dir:
             temp_path = Path(temp_dir)
@@ -125,8 +122,6 @@ def test_read_otdfctl_created_tdf_structure(self):
     def test_read_otdfctl_tdf_with_attributes(self):
         """Test reading TDF files created by otdfctl with data attributes."""
 
-        check_for_otdfctl()
-
         # Create temporary directory for work
         with tempfile.TemporaryDirectory() as temp_dir:
             temp_path = Path(temp_dir)
@@ -215,8 +210,6 @@ def test_read_otdfctl_tdf_with_attributes(self):
     def test_read_multiple_otdfctl_files(self):
         """Test reading multiple TDF files of different types created by otdfctl."""
 
-        check_for_otdfctl()
-
         # Create temporary directory for work
         with tempfile.TemporaryDirectory() as temp_dir:
             temp_path = Path(temp_dir)