arcanis/ahriman
1
0
Fork 0
mirror of https://github.com/arcan1s/ahriman.git synced 2025-04-24 15:27:17 +00:00
Code Issues Projects Releases Wiki Activity

close descriptor after uploading archive on github

Browse Source
This commit is contained in:
Evgenii Alekseev 2023-08-15 02:31:46 +03:00
parent 89d9b581bd
commit c37f67c558
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ahriman/core/upload/github.py
View File

@ -79,7 +79,9 @@ class Github(HttpUpload):
(url, _) = release["upload_url"].split("{") # it is parametrized url (url, _) = release["upload_url"].split("{") # it is parametrized url
(mime, _) = mimetypes.guess_type(path) (mime, _) = mimetypes.guess_type(path)
headers = {"Content-Type": mime} if mime is not None else {"Content-Type": "application/octet-stream"} headers = {"Content-Type": mime} if mime is not None else {"Content-Type": "application/octet-stream"}
self._request("POST", url, params={"name": path.name}, data=path.open("rb"), headers=headers)
with path.open("rb") as archive:
self._request("POST", url, params={"name": path.name}, data=archive, headers=headers)
def get_local_files(self, path: Path) -> dict[Path, str]: def get_local_files(self, path: Path) -> dict[Path, str]:
""" """

12
tests/ahriman/core/upload/test_github.py
View File

@ -31,13 +31,14 @@ def test_asset_upload(github: Github, github_release: dict[str, Any], mocker: Mo
""" """
must upload asset to the repository must upload asset to the repository
""" """
mocker.patch("pathlib.Path.open", return_value=b"") mocker.patch("pathlib.Path.open")
request_mock = mocker.patch("ahriman.core.upload.github.Github._request") request_mock = mocker.patch("ahriman.core.upload.github.Github._request")
remove_mock = mocker.patch("ahriman.core.upload.github.Github.asset_remove") remove_mock = mocker.patch("ahriman.core.upload.github.Github.asset_remove")
github.asset_upload(github_release, Path("/root/new.tar.xz")) github.asset_upload(github_release, Path("/root/new.tar.xz"))
request_mock.assert_called_once_with("POST", "upload_url", params={"name": "new.tar.xz"}, request_mock.assert_called_once_with("POST", "upload_url", params={"name": "new.tar.xz"},
data=b"", headers={"Content-Type": "application/x-tar"}) data=pytest.helpers.anyvar(int),
headers={"Content-Type": "application/x-tar"})
remove_mock.assert_not_called() remove_mock.assert_not_called()
@ -45,7 +46,7 @@ def test_asset_upload_with_removal(github: Github, github_release: dict[str, Any
""" """
must remove existing file before upload must remove existing file before upload
""" """
mocker.patch("pathlib.Path.open", return_value=b"") mocker.patch("pathlib.Path.open")
mocker.patch("ahriman.core.upload.github.Github._request") mocker.patch("ahriman.core.upload.github.Github._request")
remove_mock = mocker.patch("ahriman.core.upload.github.Github.asset_remove") remove_mock = mocker.patch("ahriman.core.upload.github.Github.asset_remove")
@ -61,14 +62,15 @@ def test_asset_upload_empty_mimetype(github: Github, github_release: dict[str, A
""" """
must upload asset to the repository with empty mime type if the library cannot guess it must upload asset to the repository with empty mime type if the library cannot guess it
""" """
mocker.patch("pathlib.Path.open", return_value=b"") mocker.patch("pathlib.Path.open")
mocker.patch("ahriman.core.upload.github.Github.asset_remove") mocker.patch("ahriman.core.upload.github.Github.asset_remove")
mocker.patch("mimetypes.guess_type", return_value=(None, None)) mocker.patch("mimetypes.guess_type", return_value=(None, None))
request_mock = mocker.patch("ahriman.core.upload.github.Github._request") request_mock = mocker.patch("ahriman.core.upload.github.Github._request")
github.asset_upload(github_release, Path("/root/new.tar.xz")) github.asset_upload(github_release, Path("/root/new.tar.xz"))
request_mock.assert_called_once_with("POST", "upload_url", params={"name": "new.tar.xz"}, request_mock.assert_called_once_with("POST", "upload_url", params={"name": "new.tar.xz"},
data=b"", headers={"Content-Type": "application/octet-stream"}) data=pytest.helpers.anyvar(int),
headers={"Content-Type": "application/octet-stream"})
def test_get_local_files(github: Github, resource_path_root: Path, mocker: MockerFixture) -> None: def test_get_local_files(github: Github, resource_path_root: Path, mocker: MockerFixture) -> None: