diff --git a/swh/web/common/archive.py b/swh/web/common/archive.py --- a/swh/web/common/archive.py +++ b/swh/web/common/archive.py @@ -186,7 +186,10 @@ def lookup_content_language(q): - """Return language information from a specified content. + """Always returns None. + + This used to return language information from a specified content, + but this is currently disabled. Args: q: query string of the form @@ -195,13 +198,7 @@ language information (dict) list if the content is found. """ - sha1 = _lookup_content_sha1(q) - if not sha1: - return None - lang = _first_element(list(idx_storage.content_language_get([sha1]))) - if not lang: - return None - return converters.from_swh(lang, hashess={"id"}) + return None def lookup_content_license(q): diff --git a/swh/web/tests/api/views/test_content.py b/swh/web/tests/api/views/test_content.py --- a/swh/web/tests/api/views/test_content.py +++ b/swh/web/tests/api/views/test_content.py @@ -50,25 +50,6 @@ } -@pytest.mark.skip # Language indexer is disabled -@given(content()) -def test_api_content_language(api_client, indexer_data, content): - indexer_data.content_add_language(content["sha1"]) - url = reverse( - "api-1-content-language", url_args={"q": "sha1_git:%s" % content["sha1_git"]} - ) - rv = check_api_get_responses(api_client, url, status_code=200) - - content_url = reverse( - "api-1-content", - url_args={"q": "sha1:%s" % content["sha1"]}, - request=rv.wsgi_request, - ) - expected_data = indexer_data.content_get_language(content["sha1"]) - expected_data["content_url"] = content_url - assert rv.data == expected_data - - def test_api_content_language_sha_not_found(api_client): unknown_content_ = random_content() diff --git a/swh/web/tests/common/test_archive.py b/swh/web/tests/common/test_archive.py --- a/swh/web/tests/common/test_archive.py +++ b/swh/web/tests/common/test_archive.py @@ -142,16 +142,6 @@ assert actual_filetype == expected_filetype -@pytest.mark.skip # Language indexer is disabled. -@given(content()) -def test_lookup_content_language(indexer_data, content): - indexer_data.content_add_language(content["sha1"]) - actual_language = archive.lookup_content_language(content["sha1"]) - - expected_language = indexer_data.content_get_language(content["sha1"]) - assert actual_language == expected_language - - @given(contents_with_ctags()) def test_lookup_expression(indexer_data, contents_with_ctags): per_page = 10 diff --git a/swh/web/tests/conftest.py b/swh/web/tests/conftest.py --- a/swh/web/tests/conftest.py +++ b/swh/web/tests/conftest.py @@ -335,14 +335,6 @@ ].to_dict() return converters.from_filetype(mimetype) - def content_add_language(self, cnt_id): - raise NotImplementedError("Language indexer is disabled.") - self.language_indexer.run([hash_to_bytes(cnt_id)], "update-dups") - - def content_get_language(self, cnt_id): - lang = next(self.idx_storage.content_language_get([hash_to_bytes(cnt_id)])) - return converters.from_swh(lang, hashess={"id"}) - def content_add_license(self, cnt_id): self.license_indexer.run([hash_to_bytes(cnt_id)], "update-dups")