diff --git a/swh/search/api/server.py b/swh/search/api/server.py --- a/swh/search/api/server.py +++ b/swh/search/api/server.py @@ -52,7 +52,8 @@ @app.before_first_request def initialized_index(): search = _get_search() - logger.info("Initializing indexes with configuration: ", search.origin_config) + if app.config["search"]["cls"] == "elasticsearch": + logger.info("Initializing indexes with configuration: ", search.origin_config) search.initialize() 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 @@ -12,9 +12,10 @@ from swh.search.api.server import app from .test_elasticsearch import CommonElasticsearchSearchTest +from .test_in_memory import CommonInmemorySearchTest -class TestRemoteSearch( +class TestRemoteSearchElasticSearch( CommonElasticsearchSearchTest, ServerTestFixture, unittest.TestCase ): @pytest.fixture(autouse=True) @@ -65,3 +66,24 @@ ) def test_origin_url_paging(self, count): pass + + +class TestRemoteSearchInMemory( + CommonInmemorySearchTest, ServerTestFixture, unittest.TestCase +): + def setUp(self): + self.config = { + "search": { + "cls": "memory", + } + } + self.app = app + super().setUp() + # self.reset() + self.search = get_search( + "remote", + url=self.url(), + ) + + def reset(self): + pass 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 @@ -14,11 +14,13 @@ from .test_search import CommonSearchTest -class InmemorySearchTest(unittest.TestCase, CommonSearchTest): +class CommonInmemorySearchTest(CommonSearchTest): @pytest.fixture(autouse=True) def _instantiate_search(self): self.search = get_search("memory") + +class InmemorySearchTest(CommonInmemorySearchTest, unittest.TestCase): def setUp(self): self.reset()