chore: cleanup for mirrored workflows

Author: b-long

conftest.py

@@ -5,11 +5,18 @@
 loaded by pytest when running tests.
 """
 
+from pathlib import Path
+
 import pytest
 
 from tests.server_logs import log_server_logs_on_failure
 
 
+@pytest.fixture(scope="session")
+def project_root(request) -> Path:
+    return request.config.rootpath  # Project root
+
+
 @pytest.hookimpl(tryfirst=True, hookwrapper=True)
 def pytest_runtest_makereport(item, call):
     """

tests/integration/otdfctl_to_python/test_cli_comparison.py

@@ -8,15 +8,17 @@
 
 import pytest
 
-from tests.support_cli_args import build_cli_decrypt_command
+from tests.support_cli_args import run_cli_decrypt
 from tests.support_otdfctl_args import (
     build_otdfctl_decrypt_command,
     build_otdfctl_encrypt_command,
 )
 
 
 @pytest.mark.integration
-def test_otdfctl_encrypt_python_decrypt(collect_server_logs, temp_credentials_file):
+def test_otdfctl_encrypt_python_decrypt(
+    collect_server_logs, temp_credentials_file, project_root
+):
     """Integration test that uses otdfctl for encryption and the Python CLI for decryption"""
 
     # Create temporary directory for work
@@ -88,17 +90,11 @@ def test_otdfctl_encrypt_python_decrypt(collect_server_logs, temp_credentials_fi
                 )
 
         # Run our Python CLI decrypt on the same TDF
-        cli_decrypt_cmd = build_cli_decrypt_command(
+        cli_decrypt_result = run_cli_decrypt(
             creds_file=temp_credentials_file,
             input_file=otdfctl_tdf_output,
             output_file=cli_decrypt_output,
-        )
-
-        cli_decrypt_result = subprocess.run(
-            cli_decrypt_cmd,
-            capture_output=True,
-            text=True,
-            cwd=Path(__file__).parent.parent,
+            cwd=project_root,
         )
 
         # Check that our CLI succeeded

tests/integration/otdfctl_to_python/test_cli_decrypt.py

@@ -10,14 +10,17 @@
 import pytest
 
 from tests.support_cli_args import (
-    build_cli_decrypt_command,
+    run_cli_decrypt,
 )
+from tests.support_common import handle_subprocess_error
 
 logger = logging.getLogger(__name__)
 
 
 @pytest.mark.integration
-def test_cli_decrypt_v4_2_2_vs_v4_3_1(all_target_mode_tdf_files, temp_credentials_file):
+def test_cli_decrypt_v4_2_2_vs_v4_3_1(
+    all_target_mode_tdf_files, temp_credentials_file, collect_server_logs, project_root
+):
     """
     Test Python CLI decrypt with various TDF versions created by otdfctl.
     """
@@ -31,10 +34,14 @@ def test_cli_decrypt_v4_2_2_vs_v4_3_1(all_target_mode_tdf_files, temp_credential
         v4_3_1_tdf = v4_3_1_files[file_type]
 
         # Decrypt v4.2.2 TDF
-        v4_2_2_output = _run_cli_decrypt(v4_2_2_tdf, temp_credentials_file)
+        v4_2_2_output = _run_cli_decrypt(
+            v4_2_2_tdf, temp_credentials_file, project_root, collect_server_logs
+        )
 
         # Decrypt v4.3.1 TDF
-        v4_3_1_output = _run_cli_decrypt(v4_3_1_tdf, temp_credentials_file)
+        v4_3_1_output = _run_cli_decrypt(
+            v4_3_1_tdf, temp_credentials_file, project_root, collect_server_logs
+        )
 
         # Both should succeed and produce output files
         assert v4_2_2_output is not None, f"Failed to decrypt v4.2.2 {file_type} TDF"
@@ -75,7 +82,7 @@ def test_cli_decrypt_v4_2_2_vs_v4_3_1(all_target_mode_tdf_files, temp_credential
 
 @pytest.mark.integration
 def test_cli_decrypt_different_file_types(
-    all_target_mode_tdf_files, temp_credentials_file
+    all_target_mode_tdf_files, temp_credentials_file, collect_server_logs, project_root
 ):
     """
     Test CLI decrypt with different file types.
@@ -98,7 +105,9 @@ def test_cli_decrypt_different_file_types(
             tdf_path = tdf_files[file_type]
 
             # Decrypt the TDF
-            output_file = _run_cli_decrypt(tdf_path, temp_credentials_file)
+            output_file = _run_cli_decrypt(
+                tdf_path, temp_credentials_file, project_root, collect_server_logs
+            )
 
             assert output_file is not None, f"Failed to decrypt {file_type} TDF"
             assert output_file.exists(), (
@@ -136,7 +145,9 @@ def test_cli_decrypt_different_file_types(
             output_file.unlink()
 
 
-def _run_cli_decrypt(tdf_path: Path, creds_file: Path) -> Path | None:
+def _run_cli_decrypt(
+    tdf_path: Path, creds_file: Path, cwd: Path, collect_server_logs
+) -> Path | None:
     """
     Helper function to run Python CLI decrypt command and return the output file path.
 
@@ -148,25 +159,20 @@ def _run_cli_decrypt(tdf_path: Path, creds_file: Path) -> Path | None:
 
     try:
         # Build CLI command
-        cmd = build_cli_decrypt_command(
+        cli_decrypt_result = run_cli_decrypt(
             creds_file=creds_file,
             input_file=tdf_path,
             output_file=output_path,
+            cwd=cwd,
         )
 
-        # Run the CLI command
-        result = subprocess.run(
-            cmd,
-            capture_output=True,
-            text=True,
-            check=True,
-            cwd=Path(__file__).parent.parent.parent,  # Project root
+        # Fail fast on errors
+        handle_subprocess_error(
+            result=cli_decrypt_result,
+            collect_server_logs=collect_server_logs,
+            scenario_name="Python CLI decrypt",
         )
 
-        logger.debug(f"CLI decrypt succeeded for {tdf_path}")
-        if result.stdout:
-            logger.debug(f"CLI stdout: {result.stdout}")
-
         return output_path
 
     except subprocess.CalledProcessError as e:

tests/integration/otdfctl_to_python/test_cli_inspect.py

@@ -12,7 +12,9 @@
 
 
 @pytest.mark.integration
-def test_cli_inspect_v4_2_2_vs_v4_3_1(all_target_mode_tdf_files, temp_credentials_file):
+def test_cli_inspect_v4_2_2_vs_v4_3_1(
+    all_target_mode_tdf_files, temp_credentials_file, project_root
+):
     """
     Test Python CLI inspect with various TDF versions created by otdfctl.
     """
@@ -26,10 +28,10 @@ def test_cli_inspect_v4_2_2_vs_v4_3_1(all_target_mode_tdf_files, temp_credential
         v4_3_1_tdf = v4_3_1_files[file_type]
 
         # Inspect v4.2.2 TDF
-        v4_2_2_result = run_cli_inspect(v4_2_2_tdf, temp_credentials_file)
+        v4_2_2_result = run_cli_inspect(v4_2_2_tdf, temp_credentials_file, project_root)
 
         # Inspect v4.3.1 TDF
-        v4_3_1_result = run_cli_inspect(v4_3_1_tdf, temp_credentials_file)
+        v4_3_1_result = run_cli_inspect(v4_3_1_tdf, temp_credentials_file, project_root)
 
         # Both should succeed
         assert v4_2_2_result is not None, f"Failed to inspect v4.2.2 {file_type} TDF"
@@ -79,8 +81,7 @@ def test_cli_inspect_v4_2_2_vs_v4_3_1(all_target_mode_tdf_files, temp_credential
 
 @pytest.mark.integration
 def test_cli_inspect_different_file_types(
-    all_target_mode_tdf_files,
-    temp_credentials_file,
+    all_target_mode_tdf_files, temp_credentials_file, project_root
 ):
     """
     Test CLI inspect with different file types.
@@ -102,7 +103,7 @@ def test_cli_inspect_different_file_types(
             tdf_path = tdf_files[file_type]
 
             # Inspect the TDF
-            result = run_cli_inspect(tdf_path, temp_credentials_file)
+            result = run_cli_inspect(tdf_path, temp_credentials_file, project_root)
 
             assert result is not None, (
                 f"Failed to inspect {file_type} TDF, TDF version {version}"

tests/integration/test_cli_integration.py

@@ -8,7 +8,10 @@
 
 import pytest
 
-from tests.support_cli_args import build_cli_decrypt_command, build_cli_encrypt_command
+from tests.support_cli_args import (
+    build_cli_encrypt_command,
+    run_cli_decrypt,
+)
 from tests.support_common import (
     get_testing_environ,
     handle_subprocess_error,
@@ -20,7 +23,9 @@
 
 
 @pytest.mark.integration
-def test_cli_decrypt_otdfctl_tdf(collect_server_logs, temp_credentials_file):
+def test_cli_decrypt_otdfctl_tdf(
+    collect_server_logs, temp_credentials_file, project_root
+):
     """
     Test that the Python CLI can successfully decrypt TDF files created by otdfctl.
     """
@@ -68,19 +73,12 @@ def test_cli_decrypt_otdfctl_tdf(collect_server_logs, temp_credentials_file):
         assert otdfctl_tdf_output.exists(), "otdfctl did not create TDF file"
         assert otdfctl_tdf_output.stat().st_size > 0, "otdfctl created empty TDF file"
 
-        cli_decrypt_cmd = build_cli_decrypt_command(
+        # Run our Python CLI decrypt on the otdfctl-created TDF
+        cli_decrypt_result = run_cli_decrypt(
             creds_file=temp_credentials_file,
             input_file=otdfctl_tdf_output,
             output_file=cli_decrypt_output,
-        )
-
-        # Run our Python CLI decrypt on the otdfctl-created TDF
-        cli_decrypt_result = subprocess.run(
-            cli_decrypt_cmd,
-            capture_output=True,
-            text=True,
-            cwd=Path(__file__).parent.parent,
-            env=get_testing_environ(),
+            cwd=project_root,
         )
 
         # Fail fast on errors
@@ -107,7 +105,9 @@ def test_cli_decrypt_otdfctl_tdf(collect_server_logs, temp_credentials_file):
 
 
 @pytest.mark.integration
-def test_otdfctl_decrypt_comparison(collect_server_logs, temp_credentials_file):
+def test_otdfctl_decrypt_comparison(
+    collect_server_logs, temp_credentials_file, project_root
+):
     """
     Test comparative decryption between otdfctl and Python CLI on the same TDF.
     """
@@ -178,19 +178,11 @@ def test_otdfctl_decrypt_comparison(collect_server_logs, temp_credentials_file):
             scenario_name="otdfctl decrypt",
         )
 
-        cli_decrypt_cmd = build_cli_decrypt_command(
+        cli_decrypt_result = run_cli_decrypt(
             creds_file=temp_credentials_file,
             input_file=otdfctl_tdf_output,
             output_file=cli_decrypt_output,
-        )
-
-        # Run our Python CLI decrypt on the same TDF
-        cli_decrypt_result = subprocess.run(
-            cli_decrypt_cmd,
-            capture_output=True,
-            text=True,
-            cwd=Path(__file__).parent.parent,
-            env=get_testing_environ(),
+            cwd=project_root,
         )
 
         # Fail fast on errors
@@ -344,7 +336,9 @@ def test_otdfctl_encrypt_decrypt_roundtrip(collect_server_logs, temp_credentials
 
 
 @pytest.mark.integration
-def test_cli_encrypt_integration(collect_server_logs, temp_credentials_file):
+def test_cli_encrypt_integration(
+    collect_server_logs, temp_credentials_file, project_root
+):
     """Integration test comparing our CLI with otdfctl"""
 
     # Create temporary directory for work
@@ -390,7 +384,7 @@ def test_cli_encrypt_integration(collect_server_logs, temp_credentials_file):
 
         # Run our Python CLI encrypt
         cli_result = subprocess.run(
-            cli_cmd, capture_output=True, text=True, cwd=Path(__file__).parent.parent
+            cli_cmd, capture_output=True, text=True, cwd=project_root
         )
 
         # Fail fast on errors