diff --git a/swh/search/__init__.py b/swh/search/__init__.py --- a/swh/search/__init__.py +++ b/swh/search/__init__.py @@ -25,7 +25,7 @@ elif cls == 'elasticsearch': from .elasticsearch import ElasticSearch as Search elif cls == 'memory': - from .in_memory import InmemorySearchTest as Search + from .in_memory import InMemorySearch as Search else: raise ValueError('Unknown indexer search class `%s`' % cls) diff --git a/swh/search/tests/test_api_client.py b/swh/search/tests/test_api_client.py --- a/swh/search/tests/test_api_client.py +++ b/swh/search/tests/test_api_client.py @@ -9,9 +9,8 @@ from swh.core.api.tests.server_testing import ServerTestFixture -from swh.search.elasticsearch import ElasticSearch +from swh.search import get_search from swh.search.api.server import app -from swh.search.api.client import RemoteSearch from .test_search import CommonSearchTest @@ -32,10 +31,14 @@ self.app = app super().setUp() self.reset() - self.search = RemoteSearch(self.url()) + self.search = get_search('remote', { + 'url': self.url(), + }) def reset(self): - search = ElasticSearch([self._elasticsearch_host]) + search = get_search('elasticsearch', { + 'hosts': [self._elasticsearch_host], + }) search.deinitialize() search.initialize() diff --git a/swh/search/tests/test_elasticsearch.py b/swh/search/tests/test_elasticsearch.py --- a/swh/search/tests/test_elasticsearch.py +++ b/swh/search/tests/test_elasticsearch.py @@ -7,7 +7,7 @@ import pytest -from swh.search.elasticsearch import ElasticSearch +from swh.search import get_search from .test_search import CommonSearchTest @@ -15,7 +15,9 @@ @pytest.fixture(autouse=True) def _instantiate_search(self, elasticsearch_host): self._elasticsearch_host = elasticsearch_host - self.search = ElasticSearch([elasticsearch_host]) + self.search = get_search('elasticsearch', { + 'hosts': [elasticsearch_host], + }) def setUp(self): self.reset() diff --git a/swh/search/tests/test_in_memory.py b/swh/search/tests/test_in_memory.py --- a/swh/search/tests/test_in_memory.py +++ b/swh/search/tests/test_in_memory.py @@ -7,14 +7,14 @@ import pytest -from swh.search.in_memory import InMemorySearch +from swh.search import get_search from .test_search import CommonSearchTest class InmemorySearchTest(unittest.TestCase, CommonSearchTest): @pytest.fixture(autouse=True) def _instantiate_search(self): - self.search = InMemorySearch() + self.search = get_search('memory', {}) def setUp(self): self.reset()