Page MenuHomeSoftware Heritage
Files F7343119

D8632.id31177.diff
No OneTemporary
Actions

D8632.id31177.diff
View Options

diff --git a/swh/lister/nixguix/tests/data/guix-swh_sources.json b/swh/lister/nixguix/tests/data/sources-failure.json
rename from swh/lister/nixguix/tests/data/guix-swh_sources.json
rename to swh/lister/nixguix/tests/data/sources-failure.json
diff --git a/swh/lister/nixguix/tests/data/nixpkgs-swh_sources.json b/swh/lister/nixguix/tests/data/sources-success.json
rename from swh/lister/nixguix/tests/data/nixpkgs-swh_sources.json
rename to swh/lister/nixguix/tests/data/sources-success.json
diff --git a/swh/lister/nixguix/tests/test_lister.py b/swh/lister/nixguix/tests/test_lister.py
--- a/swh/lister/nixguix/tests/test_lister.py
+++ b/swh/lister/nixguix/tests/test_lister.py
@@ -25,10 +25,21 @@
logger = logging.getLogger(__name__)
-
-def page_response(datadir, instance: str) -> List[Dict]:
+SOURCES = {
+ "guix": {
+ "repo": "https://git.savannah.gnu.org/cgit/guix.git/",
+ "manifest": "https://guix.gnu.org/sources.json",
+ },
+ "nixpkgs": {
+ "repo": "https://github.com/NixOS/nixpkgs",
+ "manifest": "https://nix-community.github.io/nixpkgs-swh/sources-unstable.json",
+ },
+}
+
+
+def page_response(datadir, instance: str = "success") -> List[Dict]:
"""Return list of repositories (out of test dataset)"""
- datapath = Path(datadir, f"{instance}-swh_sources.json")
+ datapath = Path(datadir, f"sources-{instance}.json")
return json.loads(datapath.read_text()) if datapath.exists else []
@@ -160,11 +171,11 @@
def test_lister_nixguix_ok(datadir, swh_scheduler, requests_mock):
"""NixGuixLister should list all origins per visit type"""
- url = "https://nix-community.github.io/nixpkgs-swh/sources-unstable.json"
- origin_upstream = "https://github.com/NixOS/nixpkgs"
+ url = SOURCES["guix"]["manifest"]
+ origin_upstream = SOURCES["guix"]["repo"]
lister = NixGuixLister(swh_scheduler, url=url, origin_upstream=origin_upstream)
- response = page_response(datadir, "nixpkgs")
+ response = page_response(datadir, "success")
requests_mock.get(
url,
[{"json": response}],
@@ -236,11 +247,11 @@
def test_lister_nixguix_mostly_noop(datadir, swh_scheduler, requests_mock):
"""NixGuixLister should ignore unsupported or incomplete origins"""
- url = "https://guix.gnu.org/sources.json"
- origin_upstream = "https://git.savannah.gnu.org/git/guix.git"
+ url = SOURCES["nixpkgs"]["manifest"]
+ origin_upstream = SOURCES["nixpkgs"]["repo"]
lister = NixGuixLister(swh_scheduler, url=url, origin_upstream=origin_upstream)
- response = page_response(datadir, "guix")
+ response = page_response(datadir, "failure")
requests_mock.get(
url,
@@ -282,8 +293,8 @@
def test_lister_nixguix_fail(datadir, swh_scheduler, requests_mock):
- url = "https://nix-community.github.io/nixpkgs-swh/sources-unstable.json"
- origin_upstream = "https://github.com/NixOS/nixpkgs"
+ url = SOURCES["nixpkgs"]["manifest"]
+ origin_upstream = SOURCES["nixpkgs"]["repo"]
lister = NixGuixLister(swh_scheduler, url=url, origin_upstream=origin_upstream)
requests_mock.get(

File Metadata

Mime Type
text/plain
Expires
Mar 17 2025, 7:31 PM (7 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3217019

Event Timeline

About · Developer information · Legal