Page MenuHomeSoftware Heritage
Files F7147821

D2973.id10720.diff
No OneTemporary
Actions

D2973.id10720.diff
View Options

diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -2,3 +2,4 @@
swh.model >= 0.0.60
swh.scheduler
swh.storage >= 0.0.184
+
diff --git a/swh/loader/package/loader.py b/swh/loader/package/loader.py
--- a/swh/loader/package/loader.py
+++ b/swh/loader/package/loader.py
@@ -317,7 +317,7 @@
status_load = "failed"
return finalize_visit()
- load_exceptions = []
+ load_exceptions: List[Exception] = []
for version in self.get_versions(): # for each
logger.debug("version: %s", version)
@@ -329,14 +329,18 @@
if revision_id is None:
try:
revision_id = self._load_revision(p_info, origin)
- status_load = "eventful"
except Exception as e:
+ self.storage.clear_buffers()
load_exceptions.append(e)
sentry_sdk.capture_exception(e)
logger.exception(
"Failed loading branch %s for %s", branch_name, self.url
)
continue
+ else:
+ # Flush loaded artifacts objects to storage
+ self.storage.flush()
+ status_load = "eventful"
if revision_id is None:
continue
@@ -439,7 +443,6 @@
logger.debug("Revision: %s", revision)
self.storage.revision_add([revision])
-
return revision.id
def _load_snapshot(
diff --git a/swh/loader/package/nixguix/tests/test_nixguix.py b/swh/loader/package/nixguix/tests/test_nixguix.py
--- a/swh/loader/package/nixguix/tests/test_nixguix.py
+++ b/swh/loader/package/nixguix/tests/test_nixguix.py
@@ -4,6 +4,9 @@
# See top-level LICENSE file for more information
import pytest
+
+from typing import Dict, Optional, Tuple
+
from json.decoder import JSONDecodeError
from swh.loader.package.nixguix.loader import (
@@ -13,6 +16,8 @@
)
from swh.loader.package.tests.common import get_stats, check_snapshot
+from swh.loader.package.utils import download
+from swh.storage.exc import HashCollision
sources_url = "https://nix-community.github.io/nixpkgs-swh/sources.json"
@@ -302,3 +307,62 @@
}
check_snapshot(expected_snapshot, storage=loader.storage)
+
+
+def fake_download(
+ url: str,
+ dest: str,
+ hashes: Dict = {},
+ filename: Optional[str] = None,
+ auth: Optional[Tuple[str, str]] = None,
+) -> Tuple[str, Dict]:
+ """Fake download which raises HashCollision (for the sake of test simpliciy,
+ let's accept that makes sense)
+
+ For tests purpose only.
+
+ """
+ if url == "https://example.com/file.txt":
+ # instead of failing because it's a file not dealt with by the nix guix
+ # loader, make it raise a hash collision
+ raise HashCollision("sha1", "f92d74e3874587aaf443d1db961d4e26dde13e9c", [])
+ return download(url, dest, hashes, filename, auth)
+
+
+def test_raise_exception(swh_config, requests_mock_datadir, mocker):
+ mock_download = mocker.patch("swh.loader.package.loader.download")
+ mock_download.side_effect = fake_download
+
+ loader = NixGuixLoader(sources_url)
+ res = loader.load()
+
+ expected_snapshot_id = "0c5881c74283793ebe9a09a105a9381e41380383"
+ assert res == {
+ "status": "eventful",
+ "snapshot_id": expected_snapshot_id,
+ }
+
+ expected_branches = {
+ "https://github.com/owner-1/repository-1/revision-1.tgz": {
+ "target": "488ad4e7b8e2511258725063cf43a2b897c503b4",
+ "target_type": "revision",
+ },
+ "evaluation": {
+ "target": "cc4e04c26672dd74e5fd0fecb78b435fb55368f7",
+ "target_type": "revision",
+ },
+ }
+ expected_snapshot = {
+ "id": expected_snapshot_id,
+ "branches": expected_branches,
+ }
+
+ check_snapshot(expected_snapshot, storage=loader.storage)
+
+ assert len(mock_download.mock_calls) == 2
+
+ origin_visit = loader.storage.origin_visit_get_latest(sources_url)
+
+ # The visit is partial because some hash collision were detected
+ assert origin_visit["status"] == "partial"
+ assert origin_visit["type"] == "nixguix"

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 23, 1:21 AM (18 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3227042

Event Timeline

About · Developer information · Legal