From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GLleNFtW12EDJgEAgWs5BA (envelope-from ) for ; Thu, 06 Jan 2022 21:51:39 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 200JMVtW12GIUgAAauVa8A (envelope-from ) for ; Thu, 06 Jan 2022 21:51:39 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 37FA83DDFC for ; Thu, 6 Jan 2022 21:51:39 +0100 (CET) Received: from localhost ([::1]:35446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5ZjV-0007Tv-UI for larch@yhetil.org; Thu, 06 Jan 2022 15:51:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5Ziw-0007SY-PS for guix-patches@gnu.org; Thu, 06 Jan 2022 15:51:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49582) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5Ziw-00013Q-D3 for guix-patches@gnu.org; Thu, 06 Jan 2022 15:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n5Ziw-0005cD-DD for guix-patches@gnu.org; Thu, 06 Jan 2022 15:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53060] [PATCH 2/2] import/github: Test it. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 Jan 2022 20:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53060 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53060@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 53060-submit@debbugs.gnu.org id=B53060.164150222021524 (code B ref 53060); Thu, 06 Jan 2022 20:51:02 +0000 Received: (at 53060) by debbugs.gnu.org; 6 Jan 2022 20:50:20 +0000 Received: from localhost ([127.0.0.1]:42484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5ZiF-0005b5-M4 for submit@debbugs.gnu.org; Thu, 06 Jan 2022 15:50:20 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:43222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5ZiB-0005aj-2r for 53060@debbugs.gnu.org; Thu, 06 Jan 2022 15:50:16 -0500 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id fYqD260094UW6Th06YqDBW; Thu, 06 Jan 2022 21:50:13 +0100 From: Maxime Devos Date: Thu, 6 Jan 2022 20:50:12 +0000 Message-Id: <20220106205012.67352-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220106205012.67352-1-maximedevos@telenet.be> References: <20220106205012.67352-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641502214; bh=Dn8SaHpQ97N/TsbuIfQKi9js25kII1nD80di4Dah7kM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=F/ySSbwJAITHVI0kCkR/i2ur9B20oiCBgCzsdoXhKxOvC1zKzYGUdUZCSMk7X84S/ EcCDUUEkAcfUI+dPMK4/RaC3dCBxHmBbG9DmdKgU1moIrQ0f+EieT0/wXrvr6ZaBm4 3bTCOr0/dMzjbntA9GEU1YNKLg2TjdmiW+LtSWIJD0p+CIbNJQ3nsWLUFwyhFzmOvB MHYFHC8wpI8+qhfpbl+Ix3ni/XwtSLAk85S6UGQ+fprxDrKc5Obnd/iuhhTIPI/Ti3 3hWQdpgn5rPT1NL4hPscCUrnA+FZKkvHBQYKlLmcStl0u2F11mBJt1SUzPuvnIlX0X o94v9PtSzzaOA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641502299; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Dn8SaHpQ97N/TsbuIfQKi9js25kII1nD80di4Dah7kM=; b=hh+lX2ay1IqD8ZfxMC8XiWvskDTbWcqX971q43qFBD+gwniK+0c193oJ8ktC8QSYr8TL1s t6Xb+m348GDHDLY9e2swVvNZGecKrvrcIO/sBxHBFksZhweV7Nx95HXg6l9xlmVYJ5xMow qqJUpiIdXT2M92Ypzby2fFfRtB7iw1xAinS7ZVXSBr0C+6Iwsffx6/cPuOuTuYmeyuDO+J ZZNIHbN3BtwO16OjRio/kquxaNhMeytmNTPAG/FD/L29C4Y0sAnAMYqYM3T3ZUwS7BRhRj SzX2dyw0R2KZOHBMIwB3rsl3OFmGEcYYAfDaMdy7viD94I3pPn6xb63axC6n6A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641502299; a=rsa-sha256; cv=none; b=WguSTVNWEtAV2FJxK4uCn1mTAcoOVzmAEELYoZP8BhUBZCSBurxxCfOLG+kaq/LtvjGNHJ HMMVa9M/+WSs9sLs2KZZu5Zi8ypGlbRJrcSoG2G+3UPgFJMHJUAbc2UhAMcC9L8qQhvasg bQnuzu1nnDN5xyBQU0TphkvDs/MDWZh0qr2JB6K684AeVkAZAoNTSpFs7YEPJ8Bma7oeFW ILmg2WRkIIKFASoFfr6l6fHvMttU7iFa1f5X+Qj3nH1vgSAvuXtkjtzYf1WZPyBYmuTFiI 7mN1gMxKaFflir4+Tu7sjDF/xtzOoaK3eHz67vVrqSbJEd49Pr5wTiJz9WddDQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b="F/ySSbwJ"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.60 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b="F/ySSbwJ"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 37FA83DDFC X-Spam-Score: -1.60 X-Migadu-Scanner: scn0.migadu.com X-TUID: KCpXpxyG+gQf * Makefile.am (SCM_TESTS): Register new tests. * guix/import/github.scm (%github-api): New variable. (fetch-releases-or-tags): Use the new variable. * tests/import-github.scm: New file with tests. --- Makefile.am | 1 + guix/import/github.scm | 9 ++- tests/import-github.scm | 139 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+), 3 deletions(-) create mode 100644 tests/import-github.scm diff --git a/Makefile.am b/Makefile.am index d6aabac261..c10af6155a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -482,6 +482,7 @@ SCM_TESTS = \ tests/hackage.scm \ tests/home-import.scm \ tests/import-git.scm \ + tests/import-github.scm \ tests/import-utils.scm \ tests/inferior.scm \ tests/lint.scm \ diff --git a/guix/import/github.scm b/guix/import/github.scm index 1adfb8d281..8c1898c0c5 100644 --- a/guix/import/github.scm +++ b/guix/import/github.scm @@ -39,7 +39,10 @@ (define-module (guix import github) #:use-module (guix upstream) #:use-module (guix http-client) #:use-module (web uri) - #:export (%github-updater)) + #:export (%github-api %github-updater)) + +;; For tests. +(define %github-api (make-parameter "https://api.github.com")) (define (find-extension url) "Return the extension of the archive e.g. '.tar.gz' given a URL, or @@ -150,11 +153,11 @@ (define (fetch-releases-or-tags url) 'https://api.github.com/repos/aconchillo/guile-json/releases' returns the empty list." (define release-url - (string-append "https://api.github.com/repos/" + (string-append (%github-api) "/repos/" (github-user-slash-repository url) "/releases")) (define tag-url - (string-append "https://api.github.com/repos/" + (string-append (%github-api) "/repos/" (github-user-slash-repository url) "/tags")) diff --git a/tests/import-github.scm b/tests/import-github.scm new file mode 100644 index 0000000000..979a0fc12b --- /dev/null +++ b/tests/import-github.scm @@ -0,0 +1,139 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Maxime Devos +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (test-import-github) + #:use-module (json) + #:use-module (srfi srfi-35) + #:use-module (srfi srfi-64) + #:use-module (guix git-download) + #:use-module (guix http-client) + #:use-module (guix import github) + #:use-module (guix packages) + #:use-module (guix tests) + #:use-module (guix upstream) + #:use-module (ice-9 match)) + +(test-begin "github") + +(define (call-with-releases thunk tags releases) + (mock ((guix http-client) http-fetch + (lambda* (uri #:key headers) + (unless (string-prefix? "mock://" uri) + (error "the URI ~a should not be used" uri)) + (define components + (string-split (substring uri 8) #\/)) + (pk 'stuff components headers) + (define (scm->json-port scm) + (open-input-string (scm->json-string scm))) + (match components + (("repos" "foo" "foomatics" "releases") + (scm->json-port releases)) + (("repos" "foo" "foomatics" "tags") + (scm->json-port tags)) + (rest (error "TODO ~a" rest))))) + (parameterize ((%github-api "mock://")) + (thunk)))) + +;; Copied from tests/minetest.scm +(define (upstream-source->sexp upstream-source) + (define url (upstream-source-urls upstream-source)) + (unless (git-reference? url) + (error "a is expected")) + `(,(upstream-source-package upstream-source) + ,(upstream-source-version upstream-source) + ,(git-reference-url url) + ,(git-reference-commit url))) + +(define* (expected-sexp new-version new-commit) + `("foomatics" ,new-version "https://github.com/foo/foomatics" ,new-commit)) + +(define (example-package old-version old-commit) + (package + (name "foomatics") + (version old-version) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/foo/foomatics") + (commit old-commit))) + (sha256 #f) ; not important for following tests + (file-name (git-file-name name version)))) + (build-system #f) + (license #f) + (synopsis #f) + (description #f) + (home-page #f))) + +(define* (found-sexp old-version old-commit tags releases) + (and=> + (call-with-releases (lambda () + ((upstream-updater-latest %github-updater) + (example-package old-version old-commit))) + tags releases) + upstream-source->sexp)) + +(define-syntax-rule (test-release test-case old-version + old-commit new-version new-commit + tags releases) + (test-equal test-case + (expected-sexp new-version new-commit) + (found-sexp old-version old-commit tags releases))) + +(test-release "newest release is choosen" + "1.0.0" "v1.0.0" "1.9" "v1.9" + #() + ;; a mixture of current, older and newer versions + #((("tag_name" . "v0.0")) + (("tag_name" . "v1.0.1")) + (("tag_name" . "v1.9")) + (("tag_name" . "v1.0.0")) + (("tag_name" . "v1.0.2")))) + +(test-release "tags are used when there are no formal releases" + "1.0.0" "v1.0.0" "1.9" "v1.9" + ;; a mixture of current, older and newer versions + #((("name" . "v0.0")) + (("name" . "v1.0.1")) + (("name" . "v1.9")) + (("name" . "v1.0.0")) + (("name" . "v1.0.2"))) + #()) + +(test-release "\"version-\" prefixes are recognised" + "1.0.0" "v1.0.0" "1.9" "version-1.9" + #((("name" . "version-1.9"))) + #()) + +(test-release "prefixes are optional" + "1.0.0" "v1.0.0" "1.9" "1.9" + #((("name" . "1.9"))) + #()) + +(test-release "prefixing by package name is acceptable" + "1.0.0" "v1.0.0" "1.9" "foomatics-1.9" + #((("name" . "foomatics-1.9"))) + #()) + +(test-release "not all prefixes are acceptable" + "1.0.0" "v1.0.0" "1.0.0" "v1.0.0" + #((("name" . "v1.0.0")) + (("name" . "barstatics-1.9"))) + #()) + +(test-end "github") -- 2.34.0