Public Access
DEVX-88: fix: correct clean_images delete URL and add retry with error handling
Post-merge / detect-type (push) Successful in 9s
Post-merge / validate-commit-msg (push) Successful in 10s
Post-merge / vikunja (push) Successful in 10s
Post-merge / sync-wiki (push) Successful in 18s
Build Images / detect-type (push) Successful in 36s
Post-merge / release (push) Successful in 25s
Post-merge / configure-repo (push) Successful in 9s
Post-merge / badges (push) Successful in 29s
Post-merge / publish (push) Successful in 19s
Build Images / build-and-push (push) Successful in 2m55s
Build Images / cleanup (push) Successful in 5m47s
Post-merge / detect-type (push) Successful in 9s
Post-merge / validate-commit-msg (push) Successful in 10s
Post-merge / vikunja (push) Successful in 10s
Post-merge / sync-wiki (push) Successful in 18s
Build Images / detect-type (push) Successful in 36s
Post-merge / release (push) Successful in 25s
Post-merge / configure-repo (push) Successful in 9s
Post-merge / badges (push) Successful in 29s
Post-merge / publish (push) Successful in 19s
Build Images / build-and-push (push) Successful in 2m55s
Build Images / cleanup (push) Successful in 5m47s
This commit was merged in pull request #140.
This commit is contained in:
@@ -321,6 +321,25 @@ class TestCleanImagesAPI:
|
||||
from devx.tools.clean_images import delete_package_version
|
||||
|
||||
mock_resp = MagicMock(status_code=204)
|
||||
with patch("devx.tools.clean_images.requests.delete", return_value=mock_resp) as mock_del:
|
||||
assert (
|
||||
delete_package_version(
|
||||
"https://git.example.com/api/v1",
|
||||
"oblachno-oss",
|
||||
"ci-base",
|
||||
"0.1.0",
|
||||
"token",
|
||||
)
|
||||
is True
|
||||
)
|
||||
# Verify URL includes container type
|
||||
url = mock_del.call_args.args[0]
|
||||
assert "/container/" in url
|
||||
|
||||
def test_delete_package_version_404_treated_as_success(self) -> None:
|
||||
from devx.tools.clean_images import delete_package_version
|
||||
|
||||
mock_resp = MagicMock(status_code=404)
|
||||
with patch("devx.tools.clean_images.requests.delete", return_value=mock_resp):
|
||||
assert (
|
||||
delete_package_version(
|
||||
@@ -336,7 +355,7 @@ class TestCleanImagesAPI:
|
||||
def test_delete_package_version_failure(self) -> None:
|
||||
from devx.tools.clean_images import delete_package_version
|
||||
|
||||
mock_resp = MagicMock(status_code=404)
|
||||
mock_resp = MagicMock(status_code=403)
|
||||
with patch("devx.tools.clean_images.requests.delete", return_value=mock_resp):
|
||||
assert (
|
||||
delete_package_version(
|
||||
@@ -349,6 +368,110 @@ class TestCleanImagesAPI:
|
||||
is False
|
||||
)
|
||||
|
||||
def test_delete_package_version_retries_on_5xx(self) -> None:
|
||||
from devx.tools.clean_images import delete_package_version
|
||||
|
||||
responses = [
|
||||
MagicMock(status_code=500),
|
||||
MagicMock(status_code=502),
|
||||
MagicMock(status_code=204),
|
||||
]
|
||||
with patch("devx.tools.clean_images.requests.delete", side_effect=responses):
|
||||
with patch("devx.tools.clean_images.time.sleep"):
|
||||
assert (
|
||||
delete_package_version(
|
||||
"https://git.example.com/api/v1",
|
||||
"oblachno-oss",
|
||||
"ci-base",
|
||||
"0.1.0",
|
||||
"token",
|
||||
max_retries=3,
|
||||
)
|
||||
is True
|
||||
)
|
||||
|
||||
def test_delete_package_version_retries_on_exception(self) -> None:
|
||||
import requests as req
|
||||
|
||||
from devx.tools.clean_images import delete_package_version
|
||||
|
||||
responses = [
|
||||
req.ConnectionError("network down"),
|
||||
MagicMock(status_code=204),
|
||||
]
|
||||
with patch("devx.tools.clean_images.requests.delete", side_effect=responses):
|
||||
with patch("devx.tools.clean_images.time.sleep"):
|
||||
assert (
|
||||
delete_package_version(
|
||||
"https://git.example.com/api/v1",
|
||||
"oblachno-oss",
|
||||
"ci-base",
|
||||
"0.1.0",
|
||||
"token",
|
||||
max_retries=3,
|
||||
)
|
||||
is True
|
||||
)
|
||||
|
||||
def test_delete_package_version_exhausts_retries_on_exception(self) -> None:
|
||||
import requests as req
|
||||
|
||||
from devx.tools.clean_images import delete_package_version
|
||||
|
||||
with patch(
|
||||
"devx.tools.clean_images.requests.delete",
|
||||
side_effect=req.ConnectionError("network down"),
|
||||
):
|
||||
with patch("devx.tools.clean_images.time.sleep"):
|
||||
assert (
|
||||
delete_package_version(
|
||||
"https://git.example.com/api/v1",
|
||||
"oblachno-oss",
|
||||
"ci-base",
|
||||
"0.1.0",
|
||||
"token",
|
||||
max_retries=2,
|
||||
)
|
||||
is False
|
||||
)
|
||||
|
||||
def test_delete_package_version_exhausts_retries_on_5xx(self) -> None:
|
||||
from devx.tools.clean_images import delete_package_version
|
||||
|
||||
with patch(
|
||||
"devx.tools.clean_images.requests.delete",
|
||||
return_value=MagicMock(status_code=500),
|
||||
):
|
||||
with patch("devx.tools.clean_images.time.sleep"):
|
||||
assert (
|
||||
delete_package_version(
|
||||
"https://git.example.com/api/v1",
|
||||
"oblachno-oss",
|
||||
"ci-base",
|
||||
"0.1.0",
|
||||
"token",
|
||||
max_retries=2,
|
||||
)
|
||||
is False
|
||||
)
|
||||
|
||||
def test_delete_package_version_zero_retries(self) -> None:
|
||||
from devx.tools.clean_images import delete_package_version
|
||||
|
||||
with patch("devx.tools.clean_images.requests.delete") as mock_del:
|
||||
assert (
|
||||
delete_package_version(
|
||||
"https://git.example.com/api/v1",
|
||||
"oblachno-oss",
|
||||
"ci-base",
|
||||
"0.1.0",
|
||||
"token",
|
||||
max_retries=0,
|
||||
)
|
||||
is False
|
||||
)
|
||||
mock_del.assert_not_called()
|
||||
|
||||
|
||||
class TestCLIBuildImage:
|
||||
def test_single_image_build(self, tmp_path: Path) -> None:
|
||||
@@ -557,7 +680,7 @@ class TestCLICleanImages:
|
||||
clean_main,
|
||||
["--owner", "oblachno-oss", "--name", "ci-base", "--dry-run"],
|
||||
)
|
||||
assert result.exit_code == 0
|
||||
assert result.exit_code != 0
|
||||
assert "Failed to list" in result.output
|
||||
|
||||
def test_delete_failure_in_cli(self) -> None:
|
||||
@@ -571,13 +694,15 @@ class TestCLICleanImages:
|
||||
{"version": "0.3.0", "created_at": "2025-03-01"},
|
||||
]
|
||||
list_resp.raise_for_status = MagicMock()
|
||||
delete_resp = MagicMock(status_code=500)
|
||||
delete_resp = MagicMock(status_code=403)
|
||||
with patch.dict("os.environ", {"CI_GITEA_TOKEN": "fake"}):
|
||||
with patch("devx.tools.clean_images.requests.get", return_value=list_resp):
|
||||
with patch("devx.tools.clean_images.requests.delete", return_value=delete_resp):
|
||||
result = runner.invoke(
|
||||
clean_main,
|
||||
["--owner", "oblachno-oss", "--name", "ci-base", "--keep", "2"],
|
||||
)
|
||||
assert result.exit_code == 0
|
||||
assert "FAILED" in result.output
|
||||
with patch("devx.tools.clean_images.time.sleep"):
|
||||
result = runner.invoke(
|
||||
clean_main,
|
||||
["--owner", "oblachno-oss", "--name", "ci-base", "--keep", "2"],
|
||||
)
|
||||
assert result.exit_code != 0
|
||||
assert "FAILED" in result.output
|
||||
assert "failed" in result.output.lower()
|
||||
|
||||
Reference in New Issue
Block a user