chore: cleanup tests

Author: b-long

conftest.py

@@ -6,6 +6,7 @@
 """
 
 import pytest
+
 from tests.server_logs import log_server_logs_on_failure
 
 
@@ -43,7 +44,6 @@ def pytest_runtest_makereport(item, call):
                 log_server_logs_on_failure(test_name)
 
 
-# Optional: Add a fixture to manually collect logs
 @pytest.fixture
 def collect_server_logs():
     """

tests/config_pydantic.py

@@ -14,8 +14,8 @@
 
 """
 
-from pydantic_settings import BaseSettings, SettingsConfigDict
 from pydantic import Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class ConfigureTdf(BaseSettings):

tests/integration/conftest.py

@@ -3,13 +3,14 @@
 """
 
 import json
+import logging
 import os
 import subprocess
 import tempfile
 from pathlib import Path
 
 import pytest
-import logging
+
 from tests.support_cli_args import get_otdfctl_flags, get_platform_url
 
 logger = logging.getLogger(__name__)

tests/integration/test_cli_comparison.py renamed to tests/integration/otdfctl_to_python/test_cli_comparison.py

@@ -3,12 +3,11 @@
 """
 
 import json
+import logging
 import subprocess
 import sys
 from pathlib import Path
 
-import logging
-
 import pytest
 
 from tests.config_pydantic import CONFIG_TDF
@@ -84,7 +83,9 @@ 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_v4_2_2(tdf_v4_2_2_files, temp_credentials_file):
+def test_cli_inspect_different_file_types_v4_2_2(
+    tdf_v4_2_2_files, temp_credentials_file
+):
     """
     Test CLI inspect with different file types.
     """
@@ -117,7 +118,9 @@ def test_cli_inspect_different_file_types_v4_2_2(tdf_v4_2_2_files, temp_credenti
 
 
 @pytest.mark.integration
-def test_cli_inspect_different_file_types_v4_3_1(tdf_v4_3_1_files, temp_credentials_file):
+def test_cli_inspect_different_file_types_v4_3_1(
+    tdf_v4_3_1_files, temp_credentials_file
+):
     """
     Test CLI inspect with different file types.
     """

tests/integration/test_cli_inspect.py renamed to tests/integration/otdfctl_to_python/test_cli_inspect.py

@@ -1,7 +1,8 @@
-from otdf_python.sdk_builder import SDKBuilder
+import httpx
+
 from otdf_python.sdk import SDK
+from otdf_python.sdk_builder import SDKBuilder
 from tests.config_pydantic import CONFIG_TDF
-import httpx
 
 
 def _get_sdk_builder() -> SDKBuilder:

tests/integration/support_sdk.py

@@ -10,7 +10,6 @@
 
 import pytest
 
-from tests.config_pydantic import CONFIG_TDF
 from tests.support_cli_args import get_platform_url
 
 original_env = os.environ.copy()
@@ -65,7 +64,7 @@ def test_cli_decrypt_otdfctl_tdf(temp_credentials_file):
             env=original_env,
         )
 
-        # If otdfctl fails, skip the test (might be server issues)
+        # If otdfctl fails to encrypt, fail fast
         if otdfctl_result.returncode != 0:
             raise Exception(f"otdfctl encrypt failed: {otdfctl_result.stderr}")
 
@@ -165,7 +164,7 @@ def test_otdfctl_decrypt_comparison(collect_server_logs, temp_credentials_file):
             env=original_env,
         )
 
-        # If otdfctl encrypt fails, skip the test (might be server issues)
+        # If otdfctl fails to encrypt, fail fast
         if otdfctl_encrypt_result.returncode != 0:
             raise Exception(f"otdfctl encrypt failed: {otdfctl_encrypt_result.stderr}")
 
@@ -226,23 +225,9 @@ def test_otdfctl_decrypt_comparison(collect_server_logs, temp_credentials_file):
 
         # Check that our CLI succeeded
         if cli_decrypt_result.returncode != 0:
-            # Collect server logs for debugging
             logs = collect_server_logs()
             print(f"Server logs when Python CLI decrypt failed:\n{logs}")
-
-            # Check if this is a server connectivity issue
-            if (
-                "401 Unauthorized" in cli_decrypt_result.stderr
-                or "token endpoint discovery" in cli_decrypt_result.stderr
-                or "Issuer endpoint must be configured" in cli_decrypt_result.stderr
-            ):
-                pytest.skip(
-                    f"Server connectivity or authentication issue: {cli_decrypt_result.stderr}"
-                )
-            else:
-                assert cli_decrypt_result.returncode == 0, (
-                    f"Python CLI decrypt failed: {cli_decrypt_result.stderr}"
-                )
+            raise Exception(f"Python CLI decrypt failed: {cli_decrypt_result.stderr}")
 
         # Verify both decrypted files were created
         assert otdfctl_decrypt_output.exists(), "otdfctl did not create decrypted file"
@@ -327,25 +312,9 @@ def test_otdfctl_encrypt_decrypt_roundtrip(collect_server_logs, temp_credentials
             env=original_env,
         )
 
-        # If otdfctl encrypt fails, skip the test (might be server issues)
+        # If otdfctl fails to encrypt, fail fast
         if otdfctl_encrypt_result.returncode != 0:
-            # Collect server logs for debugging
-            logs = collect_server_logs()
-            print(f"Server logs when otdfctl encrypt failed:\n{logs}")
-
-            # Check if this is a server connectivity issue
-            if (
-                "401 Unauthorized" in otdfctl_encrypt_result.stderr
-                or "token endpoint discovery" in otdfctl_encrypt_result.stderr
-                or "Issuer endpoint must be configured" in otdfctl_encrypt_result.stderr
-            ):
-                pytest.skip(
-                    f"Server connectivity or authentication issue: {otdfctl_encrypt_result.stderr}"
-                )
-            else:
-                assert otdfctl_encrypt_result.returncode == 0, (
-                    f"otdfctl encrypt failed: {otdfctl_encrypt_result.stderr}"
-                )
+            raise Exception(f"otdfctl encrypt failed: {otdfctl_encrypt_result.stderr}")
 
         # Verify the TDF file was created
         assert otdfctl_tdf_output.exists(), "otdfctl did not create TDF file"
@@ -378,25 +347,11 @@ def test_otdfctl_encrypt_decrypt_roundtrip(collect_server_logs, temp_credentials
             env=original_env,
         )
 
-        # Check that otdfctl decrypt succeeded
+        # If otdfctl fails to decrypt, fail fast
         if otdfctl_decrypt_result.returncode != 0:
-            # Collect server logs for debugging
             logs = collect_server_logs()
             print(f"Server logs when otdfctl decrypt failed:\n{logs}")
-
-            # Check if this is a server connectivity issue
-            if (
-                "401 Unauthorized" in otdfctl_decrypt_result.stderr
-                or "token endpoint discovery" in otdfctl_decrypt_result.stderr
-                or "Issuer endpoint must be configured" in otdfctl_decrypt_result.stderr
-            ):
-                pytest.skip(
-                    f"Server connectivity or authentication issue: {otdfctl_decrypt_result.stderr}"
-                )
-            else:
-                assert otdfctl_decrypt_result.returncode == 0, (
-                    f"otdfctl decrypt failed: {otdfctl_decrypt_result.stderr}"
-                )
+            raise Exception(f"otdfctl decrypt failed: {otdfctl_decrypt_result.stderr}")
 
         # Verify the decrypted file was created
         assert otdfctl_decrypt_output.exists(), "otdfctl did not create decrypted file"
@@ -429,14 +384,8 @@ def test_otdfctl_encrypt_decrypt_roundtrip(collect_server_logs, temp_credentials
 
 
 @pytest.mark.integration
-def test_cli_encrypt_integration(temp_credentials_file):
+def test_cli_encrypt_integration(collect_server_logs, temp_credentials_file):
     """Integration test comparing our CLI with otdfctl"""
-    # Skip if OPENTDF_PLATFORM_URL is not set
-    platform_url = CONFIG_TDF.OPENTDF_PLATFORM_URL
-    if not platform_url:
-        raise Exception(
-            "OPENTDF_PLATFORM_URL must be set in config for integration tests"
-        )
 
     # Create temporary directory for work
     with tempfile.TemporaryDirectory() as temp_dir:
@@ -502,20 +451,9 @@ def test_cli_encrypt_integration(temp_credentials_file):
 
         # Check that our CLI succeeded
         if cli_result.returncode != 0:
-            # Check if this is a server connectivity issue
-            if (
-                "401 Unauthorized" in cli_result.stderr
-                or "token endpoint discovery" in cli_result.stderr
-                or "Issuer endpoint must be configured" in cli_result.stderr
-            ):
-                pytest.skip(
-                    f"Server connectivity or authentication issue: {cli_result.stderr}"
-                )
-
-            else:
-                assert cli_result.returncode == 0, (
-                    f"Python CLI failed: {cli_result.stderr}"
-                )
+            logs = collect_server_logs()
+            print(f"Server logs when Python CLI encrypt failed:\n{logs}")
+            raise Exception(f"Python CLI failed: {cli_result.stderr}")
 
         # Both output files should exist
         assert otdfctl_output.exists(), "otdfctl output file does not exist"

tests/integration/test_cli_integration.py

@@ -13,9 +13,9 @@
 
 from otdf_python.tdf_reader import TDF_MANIFEST_FILE_NAME, TDF_PAYLOAD_FILE_NAME
 from tests.support_cli_args import (
+    get_cli_flags,
     get_otdfctl_flags,
     get_platform_url,
-    get_cli_flags,
 )
 
 original_env = os.environ.copy()

tests/integration/test_cli_tdf_validation.py

@@ -3,6 +3,7 @@
 """
 
 import pytest
+
 from otdf_python.kas_client import KASClient, KeyAccess
 from otdf_python.kas_key_cache import KASKeyCache
 from otdf_python.sdk_exceptions import SDKException

tests/integration/test_kas_client_integration.py

@@ -5,11 +5,12 @@
 import logging
 import tempfile
 from pathlib import Path
+
 import pytest
 
 from otdf_python.sdk import SDK
-from tests.config_pydantic import CONFIG_TDF
 from otdf_python.sdk_exceptions import SDKException
+from tests.config_pydantic import CONFIG_TDF
 from tests.integration.support_sdk import get_sdk_for_pe
 
 # Test files (adjust paths as needed)