use own aur wrapper (#49)

tests/ahriman/core/alpm/conftest.py

@@ -0,0 +1,12 @@
+import pytest
+
+from ahriman.core.alpm.aur import AUR
+
+
+@pytest.fixture
+def aur() -> AUR:
+    """
+    aur helper fixture
+    :return: aur helper instance
+    """
+    return AUR()

tests/ahriman/core/alpm/test_aur.py

@@ -0,0 +1,173 @@
+import json
+import pytest
+import requests
+
+from pathlib import Path
+from pytest_mock import MockerFixture
+from unittest import mock
+from unittest.mock import MagicMock
+
+from ahriman.core.alpm.aur import AUR
+from ahriman.core.exceptions import InvalidPackageInfo
+from ahriman.models.aur_package import AURPackage
+
+
+def _get_response(resource_path_root: Path) -> str:
+    """
+    load response from resource file
+    :param resource_path_root: path to resource root
+    :return: response text
+    """
+    return (resource_path_root / "models" / "package_ahriman_aur").read_text()
+
+
+def test_info(mocker: MockerFixture) -> None:
+    """
+    must call info method
+    """
+    info_mock = mocker.patch("ahriman.core.alpm.aur.AUR.package_info")
+    AUR.info("ahriman")
+    info_mock.assert_called_once_with("ahriman")
+
+
+def test_multisearch(aur_package_ahriman: AURPackage, mocker: MockerFixture) -> None:
+    """
+    must search in AUR with multiple words
+    """
+    terms = ["ahriman", "is", "cool"]
+    search_mock = mocker.patch("ahriman.core.alpm.aur.AUR.search", return_value=[aur_package_ahriman])
+
+    assert AUR.multisearch(*terms) == [aur_package_ahriman]
+    search_mock.assert_has_calls([mock.call("ahriman"), mock.call("cool")])
+
+
+def test_multisearch_empty(mocker: MockerFixture) -> None:
+    """
+    must return empty list if no long terms supplied
+    """
+    terms = ["it", "is"]
+    search_mock = mocker.patch("ahriman.core.alpm.aur.AUR.search")
+
+    assert AUR.multisearch(*terms) == []
+    search_mock.assert_not_called()
+
+
+def test_multisearch_single(aur_package_ahriman: AURPackage, mocker: MockerFixture) -> None:
+    """
+    must search in AUR with one word
+    """
+    search_mock = mocker.patch("ahriman.core.alpm.aur.AUR.search", return_value=[aur_package_ahriman])
+    assert AUR.multisearch("ahriman") == [aur_package_ahriman]
+    search_mock.assert_called_once_with("ahriman")
+
+
+def test_search(mocker: MockerFixture) -> None:
+    """
+    must call search method
+    """
+    search_mock = mocker.patch("ahriman.core.alpm.aur.AUR.package_search")
+    AUR.search("ahriman")
+    search_mock.assert_called_once_with("ahriman")
+
+
+def test_parse_response(aur_package_ahriman: AURPackage, resource_path_root: Path) -> None:
+    """
+    must parse success response
+    """
+    response = _get_response(resource_path_root)
+    assert AUR.parse_response(json.loads(response)) == [aur_package_ahriman]
+
+
+def test_parse_response_error(resource_path_root: Path) -> None:
+    """
+    must raise exception on invalid response
+    """
+    response = (resource_path_root / "models" / "aur_error").read_text()
+    with pytest.raises(InvalidPackageInfo, match="Incorrect request type specified."):
+        AUR.parse_response(json.loads(response))
+
+
+def test_parse_response_unknown_error(resource_path_root: Path) -> None:
+    """
+    must raise exception on invalid response with empty error message
+    """
+    with pytest.raises(InvalidPackageInfo, match="Unknown API error"):
+        AUR.parse_response({"type": "error"})
+
+
+def test_make_request(aur: AUR, aur_package_ahriman: AURPackage,
+                      mocker: MockerFixture, resource_path_root: Path) -> None:
+    """
+    must perform request to AUR
+    """
+    response_mock = MagicMock()
+    response_mock.json.return_value = json.loads(_get_response(resource_path_root))
+    request_mock = mocker.patch("requests.get", return_value=response_mock)
+
+    assert aur.make_request("info", "ahriman") == [aur_package_ahriman]
+    request_mock.assert_called_once_with(
+        "https://aur.archlinux.org/rpc", params={"v": "5", "type": "info", "arg": ["ahriman"]})
+
+
+def test_make_request_multi_arg(aur: AUR, aur_package_ahriman: AURPackage,
+                                mocker: MockerFixture, resource_path_root: Path) -> None:
+    """
+    must perform request to AUR with multiple args
+    """
+    response_mock = MagicMock()
+    response_mock.json.return_value = json.loads(_get_response(resource_path_root))
+    request_mock = mocker.patch("requests.get", return_value=response_mock)
+
+    assert aur.make_request("search", "ahriman", "is", "cool") == [aur_package_ahriman]
+    request_mock.assert_called_once_with(
+        "https://aur.archlinux.org/rpc", params={"v": "5", "type": "search", "arg[]": ["ahriman", "is", "cool"]})
+
+
+def test_make_request_with_kwargs(aur: AUR, aur_package_ahriman: AURPackage,
+                                  mocker: MockerFixture, resource_path_root: Path) -> None:
+    """
+    must perform request to AUR with named parameters
+    """
+    response_mock = MagicMock()
+    response_mock.json.return_value = json.loads(_get_response(resource_path_root))
+    request_mock = mocker.patch("requests.get", return_value=response_mock)
+
+    assert aur.make_request("search", "ahriman", by="name") == [aur_package_ahriman]
+    request_mock.assert_called_once_with(
+        "https://aur.archlinux.org/rpc", params={"v": "5", "type": "search", "arg": ["ahriman"], "by": "name"})
+
+
+def test_make_request_failed(aur: AUR, mocker: MockerFixture) -> None:
+    """
+    must reraise generic exception
+    """
+    mocker.patch("requests.get", side_effect=Exception())
+    with pytest.raises(Exception):
+        aur.make_request("info", "ahriman")
+
+
+def test_make_request_failed_http_error(aur: AUR, mocker: MockerFixture) -> None:
+    """
+    must reraise http exception
+    """
+    mocker.patch("requests.get", side_effect=requests.exceptions.HTTPError())
+    with pytest.raises(requests.exceptions.HTTPError):
+        aur.make_request("info", "ahriman")
+
+
+def test_package_info(aur: AUR, aur_package_ahriman: AURPackage, mocker: MockerFixture) -> None:
+    """
+    must make request for info
+    """
+    request_mock = mocker.patch("ahriman.core.alpm.aur.AUR.make_request", return_value=[aur_package_ahriman])
+    assert aur.package_info(aur_package_ahriman.name) == aur_package_ahriman
+    request_mock.assert_called_once_with("info", aur_package_ahriman.name)
+
+
+def test_package_search(aur: AUR, aur_package_ahriman: AURPackage, mocker: MockerFixture) -> None:
+    """
+    must make request for search
+    """
+    request_mock = mocker.patch("ahriman.core.alpm.aur.AUR.make_request", return_value=[aur_package_ahriman])
+    assert aur.package_search(aur_package_ahriman.name, by="name") == [aur_package_ahriman]
+    request_mock.assert_called_once_with("search", aur_package_ahriman.name, by="name")

tests/ahriman/core/test_util.py

@@ -1,4 +1,3 @@
-import aur
 import datetime
 import logging
 import pytest
@@ -6,45 +5,12 @@ import subprocess
 
 from pathlib import Path
 from pytest_mock import MockerFixture
-from unittest import mock
 
 from ahriman.core.exceptions import InvalidOption, UnsafeRun
-from ahriman.core.util import aur_search, check_output, check_user, filter_json, package_like, pretty_datetime, \
-    pretty_size, walk
+from ahriman.core.util import check_output, check_user, filter_json, package_like, pretty_datetime, pretty_size, walk
 from ahriman.models.package import Package
 
 
-def test_aur_search(aur_package_ahriman: aur.Package, mocker: MockerFixture) -> None:
-    """
-    must search in AUR with multiple words
-    """
-    terms = ["ahriman", "is", "cool"]
-    search_mock = mocker.patch("aur.search", return_value=[aur_package_ahriman])
-
-    assert aur_search(*terms) == [aur_package_ahriman]
-    search_mock.assert_has_calls([mock.call("ahriman"), mock.call("cool")])
-
-
-def test_aur_search_empty(mocker: MockerFixture) -> None:
-    """
-    must return empty list if no long terms supplied
-    """
-    terms = ["it", "is"]
-    search_mock = mocker.patch("aur.search")
-
-    assert aur_search(*terms) == []
-    search_mock.assert_not_called()
-
-
-def test_aur_search_single(aur_package_ahriman: aur.Package, mocker: MockerFixture) -> None:
-    """
-    must search in AUR with one word
-    """
-    search_mock = mocker.patch("aur.search", return_value=[aur_package_ahriman])
-    assert aur_search("ahriman") == [aur_package_ahriman]
-    search_mock.assert_called_once_with("ahriman")
-
-
 def test_check_output(mocker: MockerFixture) -> None:
     """
     must run command and log result
@@ -127,7 +93,7 @@ def test_filter_json(package_ahriman: Package) -> None:
 
 def test_filter_json_empty_value(package_ahriman: Package) -> None:
     """
-    must return empty values from object
+    must filter empty values from object
     """
     probe = package_ahriman.view()
     probe["base"] = None
@@ -238,8 +204,10 @@ def test_walk(resource_path_root: Path) -> None:
     expected = sorted([
         resource_path_root / "core/ahriman.ini",
         resource_path_root / "core/logging.ini",
+        resource_path_root / "models/aur_error",
         resource_path_root / "models/big_file_checksum",
         resource_path_root / "models/empty_file_checksum",
+        resource_path_root / "models/package_ahriman_aur",
         resource_path_root / "models/package_ahriman_srcinfo",
         resource_path_root / "models/package_tpacpi-bat-git_srcinfo",
         resource_path_root / "models/package_yay_srcinfo",

tests/ahriman/core/upload/test_http_upload.py

@@ -22,7 +22,7 @@ def test_calculate_hash_small(resource_path_root: Path) -> None:
     must calculate checksum for path which is single chunk
     """
     path = resource_path_root / "models" / "package_ahriman_srcinfo"
-    assert HttpUpload.calculate_hash(path) == "a55f82198e56061295d405aeb58f4062"
+    assert HttpUpload.calculate_hash(path) == "c0aaf6ebf95ca9206dc8ba1d8ff10af3"
 
 
 def test_get_body_get_hashes() -> None:

tests/ahriman/core/upload/test_s3.py

@@ -31,7 +31,7 @@ def test_calculate_etag_small(resource_path_root: Path) -> None:
     must calculate checksum for path which is single chunk
     """
     path = resource_path_root / "models" / "package_ahriman_srcinfo"
-    assert S3.calculate_etag(path, _chunk_size) == "a55f82198e56061295d405aeb58f4062"
+    assert S3.calculate_etag(path, _chunk_size) == "c0aaf6ebf95ca9206dc8ba1d8ff10af3"
 
 
 def test_files_remove(s3_remote_objects: List[Any]) -> None: