From 749b9582061f7d929be83a194040b63b41afec81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 27 Feb 2020 23:20:48 +0100 Subject: [PATCH] swh: Adjust 'origin' test. This is a followup to 3d2f29382de2d0ee852745cc002dfe2b5d22e1c2. * tests/swh.scm (%origin): Remove "id". ("lookup-origin"): Remove use of 'origin-id'. --- tests/swh.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/swh.scm b/tests/swh.scm index e36c54e5fb..aef68acbe7 100644 --- a/tests/swh.scm +++ b/tests/swh.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2019, 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,8 +25,7 @@ (define-module (test-swh) ;; Test the JSON mapping machinery used in (guix swh). (define %origin - "{ \"id\": 42, - \"visits_url\": \"/visits/42\", + "{ \"visits_url\": \"/visits/42\", \"type\": \"git\", \"url\": \"http://example.org/guix.git\" }") @@ -48,11 +47,10 @@ (define-syntax-rule (with-json-result str exp ...) (test-begin "swh") (test-equal "lookup-origin" - (list 42 "git" "http://example.org/guix.git") + (list "git" "http://example.org/guix.git") (with-json-result %origin (let ((origin (lookup-origin "http://example.org/guix.git"))) - (list (origin-id origin) - (origin-type origin) + (list (origin-type origin) (origin-url origin))))) (test-equal "lookup-origin, not found"