From 83d615a32b3bb7598d0009df8220fb1b3ef54df0 Mon Sep 17 00:00:00 2001 From: Massimiliano Pippi Date: Fri, 17 Feb 2023 19:38:03 +0100 Subject: [PATCH] feat: include testing facilities into haystack package (#4182) --- haystack/testing/__init__.py | 1 + .../test_base.py => haystack/testing/document_store.py | 1 + test/document_stores/test_elasticsearch.py | 2 +- test/document_stores/test_faiss.py | 9 +-------- test/document_stores/test_memory.py | 3 +-- test/document_stores/test_milvus.py | 3 +-- test/document_stores/test_opensearch.py | 2 +- test/document_stores/test_pinecone.py | 3 +-- test/document_stores/test_sql.py | 3 +-- test/document_stores/test_sql_based.py | 2 -- test/document_stores/test_weaviate.py | 4 +--- 11 files changed, 10 insertions(+), 23 deletions(-) create mode 100644 haystack/testing/__init__.py rename test/document_stores/test_base.py => haystack/testing/document_store.py (99%) diff --git a/haystack/testing/__init__.py b/haystack/testing/__init__.py new file mode 100644 index 000000000..4bbf2c404 --- /dev/null +++ b/haystack/testing/__init__.py @@ -0,0 +1 @@ +from .document_store import DocumentStoreBaseTestAbstract diff --git a/test/document_stores/test_base.py b/haystack/testing/document_store.py similarity index 99% rename from test/document_stores/test_base.py rename to haystack/testing/document_store.py index a1e0f74ff..8a307f5a6 100644 --- a/test/document_stores/test_base.py +++ b/haystack/testing/document_store.py @@ -1,3 +1,4 @@ +# pylint: disable=too-many-public-methods import sys import pytest diff --git a/test/document_stores/test_elasticsearch.py b/test/document_stores/test_elasticsearch.py index 08c7ba96e..09cc89c29 100644 --- a/test/document_stores/test_elasticsearch.py +++ b/test/document_stores/test_elasticsearch.py @@ -9,8 +9,8 @@ from haystack.document_stores.elasticsearch import ElasticsearchDocumentStore, E from haystack.document_stores.es_converter import elasticsearch_index_to_document_store from haystack.document_stores.memory import InMemoryDocumentStore from haystack.nodes import PreProcessor +from haystack.testing import DocumentStoreBaseTestAbstract -from .test_base import DocumentStoreBaseTestAbstract from .test_search_engine import SearchEngineDocumentStoreTestAbstract diff --git a/test/document_stores/test_faiss.py b/test/document_stores/test_faiss.py index b82d592c2..512c1f995 100644 --- a/test/document_stores/test_faiss.py +++ b/test/document_stores/test_faiss.py @@ -1,18 +1,11 @@ -import sys -import os - -import yaml import faiss import pytest import numpy as np -from haystack.schema import Document from haystack.document_stores.faiss import FAISSDocumentStore - -from .test_base import DocumentStoreBaseTestAbstract +from haystack.testing import DocumentStoreBaseTestAbstract from haystack.pipelines import Pipeline -from haystack.nodes.retriever.dense import EmbeddingRetriever from ..conftest import MockDenseRetriever diff --git a/test/document_stores/test_memory.py b/test/document_stores/test_memory.py index d04bb1fd3..ab8035ca5 100644 --- a/test/document_stores/test_memory.py +++ b/test/document_stores/test_memory.py @@ -7,8 +7,7 @@ import numpy as np from haystack.document_stores.memory import InMemoryDocumentStore from haystack.schema import Document - -from .test_base import DocumentStoreBaseTestAbstract +from haystack.testing import DocumentStoreBaseTestAbstract class TestInMemoryDocumentStore(DocumentStoreBaseTestAbstract): diff --git a/test/document_stores/test_milvus.py b/test/document_stores/test_milvus.py index fd9d9be40..45f408e9a 100644 --- a/test/document_stores/test_milvus.py +++ b/test/document_stores/test_milvus.py @@ -3,8 +3,7 @@ import numpy as np from haystack.document_stores.milvus import MilvusDocumentStore from haystack.schema import Document - -from .test_base import DocumentStoreBaseTestAbstract +from haystack.testing import DocumentStoreBaseTestAbstract class TestMilvusDocumentStore(DocumentStoreBaseTestAbstract): diff --git a/test/document_stores/test_opensearch.py b/test/document_stores/test_opensearch.py index dc4f4486e..52dabcb57 100644 --- a/test/document_stores/test_opensearch.py +++ b/test/document_stores/test_opensearch.py @@ -18,8 +18,8 @@ from haystack.document_stores.opensearch import ( tqdm, ) from haystack.errors import DocumentStoreError +from haystack.testing import DocumentStoreBaseTestAbstract -from .test_base import DocumentStoreBaseTestAbstract from .test_search_engine import SearchEngineDocumentStoreTestAbstract diff --git a/test/document_stores/test_pinecone.py b/test/document_stores/test_pinecone.py index 626f41a72..8d92296f5 100644 --- a/test/document_stores/test_pinecone.py +++ b/test/document_stores/test_pinecone.py @@ -10,9 +10,8 @@ import pytest from haystack.document_stores.pinecone import PineconeDocumentStore from haystack.schema import Document from haystack.errors import FilterError, PineconeDocumentStoreError +from haystack.testing import DocumentStoreBaseTestAbstract - -from .test_base import DocumentStoreBaseTestAbstract from ..mocks import pinecone as pinecone_mock from ..nodes.test_retriever import MockBaseRetriever diff --git a/test/document_stores/test_sql.py b/test/document_stores/test_sql.py index 13b64ffb9..b57a98eb9 100644 --- a/test/document_stores/test_sql.py +++ b/test/document_stores/test_sql.py @@ -5,8 +5,7 @@ import pytest from haystack.document_stores.sql import LabelORM, SQLDocumentStore from haystack.schema import Document - -from .test_base import DocumentStoreBaseTestAbstract +from haystack.testing import DocumentStoreBaseTestAbstract class TestSQLDocumentStore(DocumentStoreBaseTestAbstract): diff --git a/test/document_stores/test_sql_based.py b/test/document_stores/test_sql_based.py index 45c857ae6..f2bedbf51 100644 --- a/test/document_stores/test_sql_based.py +++ b/test/document_stores/test_sql_based.py @@ -1,5 +1,3 @@ -import math - import pytest import numpy as np diff --git a/test/document_stores/test_weaviate.py b/test/document_stores/test_weaviate.py index 07774c4b0..3627bd254 100644 --- a/test/document_stores/test_weaviate.py +++ b/test/document_stores/test_weaviate.py @@ -2,9 +2,7 @@ import pytest from haystack.document_stores.weaviate import WeaviateDocumentStore from haystack.schema import Document - -from .test_base import DocumentStoreBaseTestAbstract - +from haystack.testing import DocumentStoreBaseTestAbstract import uuid from unittest.mock import MagicMock