add _get_unique_index_name to handle tests with same name

Author: mpangrazzi

.github/workflows/opensearch.yml

@@ -55,7 +55,7 @@ jobs:
         if: matrix.python-version == '3.10' && runner.os == 'Linux'
         run: hatch run docs
 
-      - name: Run tests in parallel
+      - name: Run tests (in parallel, using 4 cores)
         run: hatch run test:cov-retry -n 4  # GA runner has 4 cores
 
       - name: Run unit tests with lowest direct dependencies

integrations/opensearch/tests/conftest.py

@@ -1,11 +1,27 @@
 import asyncio
+import re
 
 import pytest
 from haystack import Document
 
 from haystack_integrations.document_stores.opensearch.document_store import OpenSearchDocumentStore
 
 
+def _get_unique_index_name(request) -> str:
+    """
+    Generate a unique, valid OpenSearch index name from the test's nodeid.
+
+    Uses the full nodeid (e.g., 'test_document_store_async.py::TestClass::test_method')
+    to avoid collisions when tests in different files/classes share the same method name.
+    """
+    # Use nodeid for uniqueness across files/classes, sanitize for valid index name
+    # OpenSearch index names must be lowercase and cannot contain: \, /, *, ?, ", <, >, |, space, comma, #
+    index_name = re.sub(r"[^a-zA-Z0-9_-]", "_", request.node.nodeid).lower()
+    # Ensure it doesn't start with -, _, or + and is not longer than 255 chars
+    index_name = index_name.lstrip("-_+")[:255]
+    return index_name
+
+
 @pytest.fixture
 def document_store(request):
     """
@@ -14,7 +30,7 @@ def document_store(request):
     """
     hosts = ["https://localhost:9200"]
     # Use a different index for each test so we can run them in parallel
-    index = f"{request.node.name}"
+    index = _get_unique_index_name(request)
 
     store = OpenSearchDocumentStore(
         hosts=hosts,
@@ -38,7 +54,7 @@ def document_store(request):
 @pytest.fixture
 def document_store_2(request):
     hosts = ["https://localhost:9200"]
-    index = f"test_index_2_{request.node.name}"
+    index = f"test_index_2_{_get_unique_index_name(request)}"
 
     store = OpenSearchDocumentStore(
         hosts=hosts,
@@ -67,7 +83,7 @@ def document_store_readonly(request):
     """
     hosts = ["https://localhost:9200"]
     # Use a different index for each test so we can run them in parallel
-    index = f"{request.node.name}"
+    index = _get_unique_index_name(request)
 
     store = OpenSearchDocumentStore(
         hosts=hosts,
@@ -96,7 +112,7 @@ def document_store_embedding_dim_4_no_emb_returned(request):
     """
     hosts = ["https://localhost:9200"]
     # Use a different index for each test so we can run them in parallel
-    index = f"{request.node.name}"
+    index = _get_unique_index_name(request)
 
     store = OpenSearchDocumentStore(
         hosts=hosts,
@@ -121,7 +137,7 @@ def document_store_embedding_dim_4_no_emb_returned_faiss(request):
     """
     hosts = ["https://localhost:9200"]
     # Use a different index for each test so we can run them in parallel
-    index = f"{request.node.name}"
+    index = _get_unique_index_name(request)
 
     store = OpenSearchDocumentStore(
         hosts=hosts,

integrations/opensearch/tests/test_document_store.py

@@ -443,28 +443,6 @@ def test_write_documents_max_chunk_bytes(self, mock_bulk, document_store):
 
         assert mock_bulk.call_args.kwargs["max_chunk_bytes"] == DEFAULT_MAX_CHUNK_BYTES
 
-    @pytest.fixture
-    def document_store_embedding_dim_4_no_emb_returned(self, request):
-        """
-        This is the most basic requirement for the child class: provide
-        an instance of this document store so the base class can use it.
-        """
-        hosts = ["https://localhost:9200"]
-        # Use a different index for each test so we can run them in parallel
-        index = f"{request.node.name}"
-
-        store = OpenSearchDocumentStore(
-            hosts=hosts,
-            index=index,
-            http_auth=("admin", "admin"),
-            verify_certs=False,
-            embedding_dim=4,
-            return_embedding=False,
-            method={"space_type": "cosinesimil", "engine": "nmslib", "name": "hnsw"},
-        )
-        yield store
-        store._client.indices.delete(index=index, params={"ignore": [400, 404]})
-
     def test_embedding_retrieval_but_dont_return_embeddings_for_embedding_retrieval(
         self, document_store_embedding_dim_4_no_emb_returned: OpenSearchDocumentStore
     ):