Parametrize embedding and llm in matrix tests

ragstack-e2e-tests/e2e_tests/langchain/test_compatibility_matrix.py

@@ -188,32 +188,16 @@ def test_openai_azure_astra_dev():
 
 
 @pytest.mark.parametrize("vector_db", vector_dbs())
-def test_openai_azure(vector_db: str):
-    _run_test(vector_db=vector_db, embedding="openai-azure", llm="openai-azure")
-
-
-@pytest.mark.parametrize("vector_db", vector_dbs())
-def test_openai(vector_db: str):
-    _run_test(vector_db=vector_db, embedding="openai", llm="openai")
-
-
-@pytest.mark.parametrize("vector_db", vector_dbs())
-def test_vertex_ai(vector_db: str):
-    _run_test(vector_db=vector_db, embedding="vertex-ai", llm="vertex-ai")
-
-
-@pytest.mark.parametrize("vector_db", vector_dbs())
-def test_bedrock_anthropic(vector_db: str):
-    _run_test(
-        vector_db=vector_db,
-        embedding="bedrock-titan",
-        llm="bedrock-anthropic",
-    )
-
-
-@pytest.mark.parametrize("vector_db", vector_dbs())
-def test_bedrock_meta(vector_db: str):
-    _run_test(vector_db=vector_db, embedding="bedrock-cohere", llm="bedrock-meta")
+@pytest.mark.parametrize("embedding,llm", [
+    ("openai", "openai"),
+    ("openai-azure", "openai-azure"),
+    ("vertex-ai", "vertex-ai"),
+    ("bedrock-titan", "bedrock-anthropic"),
+    ("bedrock-cohere", "bedrock-meta"),
+
+])
+def test_openai_azure(embedding: str, llm: str, vector_db: str):
+    _run_test(vector_db=vector_db, embedding=embedding, llm=llm)
 
 
 def test_huggingface_hub():