Handle CI database errors

Author: fileames

integrations/oracle/tests/conftest.py

@@ -6,12 +6,19 @@
 import uuid
 from unittest.mock import MagicMock
 
+import oracledb as _oracledb
 import pytest
 from haystack.dataclasses import Document
 from haystack.utils import Secret
 
 from haystack_integrations.document_stores.oracle import OracleConnectionConfig, OracleDocumentStore
 
+_ORACLE_FEATURE_INTEGRATION_FILE = "test_oracle_features_integration.py"
+_ORACLE_FEATURE_SKIP_REASONS = {
+    "ORA-00904": "Oracle vector APIs are unavailable in this live database",
+    "ORA-51962": "Oracle vector memory area is exhausted in this live database",
+}
+
 
 def _env_value(*names: str, default: str | None = None) -> str | None:
     for name in names:
@@ -21,6 +28,37 @@ def _env_value(*names: str, default: str | None = None) -> str | None:
     return default
 
 
+def _oracle_feature_skip_reason(exc: BaseException) -> str | None:
+    if not isinstance(exc, _oracledb.DatabaseError):
+        return None
+    message = str(exc)
+    for error_code, reason in _ORACLE_FEATURE_SKIP_REASONS.items():
+        if error_code in message:
+            return reason
+    return None
+
+
+def _is_oracle_feature_integration_test(item) -> bool:
+    return item.path.name == _ORACLE_FEATURE_INTEGRATION_FILE and item.get_closest_marker("integration") is not None
+
+
+@pytest.hookimpl(hookwrapper=True)
+def pytest_runtest_makereport(item, call):
+    outcome = yield
+    report = outcome.get_result()
+    if call.when != "call" or not report.failed or call.excinfo is None:
+        return
+    if not _is_oracle_feature_integration_test(item):
+        return
+
+    reason = _oracle_feature_skip_reason(call.excinfo.value)
+    if reason is None:
+        return
+
+    report.outcome = "skipped"
+    report.longrepr = (str(item.path), report.location[1], f"Skipped: {reason}")
+
+
 def connection_config(*, secret_source: str = "token") -> OracleConnectionConfig:
     wallet_location = _env_value("ORACLE_WALLET_LOCATION")
     if secret_source == "env_var":

integrations/oracle/tests/test_oracle_features_integration.py

@@ -70,11 +70,6 @@ def _drop_sql_index_if_exists(store: OracleDocumentStore, index_name: str) -> No
         raise
 
 
-def _skip_if_vector_memory_exhausted(exc: oracledb.DatabaseError) -> None:
-    if "ORA-51962" in str(exc):
-        pytest.skip("Oracle vector memory area is exhausted; live vector index creation is unavailable")
-
-
 @contextmanager
 def _temporary_store(
     connection_config, embedding_dim: int = 4, *, prefix: str = "HS_IT"
@@ -154,20 +149,16 @@ def test_hnsw_vector_index_creation_live(connection_config) -> None:
             policy=DuplicatePolicy.NONE,
         )
         try:
-            try:
-                hnsw_store.create_vector_index(
-                    index_type="HNSW",
-                    params={
-                        "idx_name": hnsw_index_name,
-                        "neighbors": 2,
-                        "efConstruction": 16,
-                        "accuracy": 80,
-                        "parallel": 1,
-                    },
-                )
-            except oracledb.DatabaseError as exc:
-                _skip_if_vector_memory_exhausted(exc)
-                raise
+            hnsw_store.create_vector_index(
+                index_type="HNSW",
+                params={
+                    "idx_name": hnsw_index_name,
+                    "neighbors": 2,
+                    "efConstruction": 16,
+                    "accuracy": 80,
+                    "parallel": 1,
+                },
+            )
         finally:
             _drop_sql_index_if_exists(hnsw_store, hnsw_index_name)
 
@@ -180,19 +171,15 @@ def test_ivf_vector_index_creation_live(connection_config) -> None:
             policy=DuplicatePolicy.NONE,
         )
         try:
-            try:
-                ivf_store.create_vector_index(
-                    index_type="IVF",
-                    params={
-                        "idx_name": ivf_index_name,
-                        "neighbor_partitions": 1,
-                        "accuracy": 90,
-                        "parallel": 1,
-                    },
-                )
-            except oracledb.DatabaseError as exc:
-                _skip_if_vector_memory_exhausted(exc)
-                raise
+            ivf_store.create_vector_index(
+                index_type="IVF",
+                params={
+                    "idx_name": ivf_index_name,
+                    "neighbor_partitions": 1,
+                    "accuracy": 90,
+                    "parallel": 1,
+                },
+            )
         finally:
             _drop_sql_index_if_exists(ivf_store, ivf_index_name)
 
@@ -206,19 +193,15 @@ async def test_async_ivf_vector_index_creation_live(connection_config) -> None:
             policy=DuplicatePolicy.NONE,
         )
         try:
-            try:
-                await store.create_vector_index_async(
-                    index_type="IVF",
-                    params={
-                        "idx_name": index_name,
-                        "neighbor_partitions": 1,
-                        "accuracy": 90,
-                        "parallel": 1,
-                    },
-                )
-            except oracledb.DatabaseError as exc:
-                _skip_if_vector_memory_exhausted(exc)
-                raise
+            await store.create_vector_index_async(
+                index_type="IVF",
+                params={
+                    "idx_name": index_name,
+                    "neighbor_partitions": 1,
+                    "accuracy": 90,
+                    "parallel": 1,
+                },
+            )
         finally:
             _drop_sql_index_if_exists(store, index_name)