diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/builders.scm | 1 | ||||
| -rw-r--r-- | tests/channels.scm | 1 | ||||
| -rw-r--r-- | tests/cpan.scm | 2 | ||||
| -rw-r--r-- | tests/derivations.scm | 1 | ||||
| -rw-r--r-- | tests/gexp.scm | 1 | ||||
| -rw-r--r-- | tests/git.scm | 32 | ||||
| -rw-r--r-- | tests/graph.scm | 1 | ||||
| -rw-r--r-- | tests/guix-build-branch.sh | 4 | ||||
| -rw-r--r-- | tests/guix-daemon.sh | 4 | ||||
| -rw-r--r-- | tests/lint.scm | 32 | ||||
| -rw-r--r-- | tests/monads.scm | 1 | ||||
| -rw-r--r-- | tests/pack.scm | 1 | ||||
| -rw-r--r-- | tests/packages.scm | 1 | ||||
| -rw-r--r-- | tests/profiles.scm | 1 | ||||
| -rw-r--r-- | tests/system.scm | 1 |
15 files changed, 67 insertions, 17 deletions
diff --git a/tests/builders.scm b/tests/builders.scm index 2853227465..0b5577c7a3 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -25,7 +25,6 @@ #:use-module (guix build gnu-build-system) #:use-module (guix build utils) #:use-module (guix build-system python) - #:use-module (guix grafts) #:use-module (guix store) #:use-module (guix monads) #:use-module (guix utils) diff --git a/tests/channels.scm b/tests/channels.scm index 0fe870dbaf..62312e240c 100644 --- a/tests/channels.scm +++ b/tests/channels.scm @@ -23,7 +23,6 @@ #:use-module ((guix build syscalls) #:select (mkdtemp!)) #:use-module (guix tests) #:use-module (guix store) - #:use-module ((guix grafts) #:select (%graft?)) #:use-module (guix derivations) #:use-module (guix sets) #:use-module (guix gexp) diff --git a/tests/cpan.scm b/tests/cpan.scm index b4db9e60e4..bbcd108e12 100644 --- a/tests/cpan.scm +++ b/tests/cpan.scm @@ -23,7 +23,7 @@ #:use-module (guix base32) #:use-module (gcrypt hash) #:use-module (guix tests http) - #:use-module (guix grafts) + #:use-module ((guix store) #:select (%graft?)) #:use-module (srfi srfi-64) #:use-module (web client) #:use-module (ice-9 match)) diff --git a/tests/derivations.scm b/tests/derivations.scm index 57d80412dc..3912fd31d8 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -20,7 +20,6 @@ (define-module (test-derivations) #:use-module (guix derivations) - #:use-module (guix grafts) #:use-module (guix store) #:use-module (guix utils) #:use-module ((gcrypt hash) #:prefix gcrypt:) diff --git a/tests/gexp.scm b/tests/gexp.scm index 07e940ffdc..6d57ac5d7a 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -21,7 +21,6 @@ #:use-module (guix store) #:use-module (guix monads) #:use-module (guix gexp) - #:use-module (guix grafts) #:use-module (guix derivations) #:use-module (guix packages) #:use-module (guix build-system trivial) diff --git a/tests/git.scm b/tests/git.scm index ca59d2a33e..9c944d65b1 100644 --- a/tests/git.scm +++ b/tests/git.scm @@ -22,8 +22,12 @@ #:use-module (guix git) #:use-module (guix tests git) #:use-module (guix build utils) + #:use-module ((guix utils) #:select (call-with-temporary-directory)) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-64)) + #:use-module (srfi srfi-64) + #:use-module (srfi srfi-71) + #:use-module (ice-9 popen) + #:use-module (ice-9 textual-ports)) ;; Test the (guix git) tools. @@ -239,4 +243,30 @@ (tag "v1.1" "Release 1.1")) (remote-refs directory #:tags? #t))) +(unless (which (git-command)) (test-skip 1)) +(test-assert "update-cached-checkout, tag" + (call-with-temporary-directory + (lambda (cache) + (with-temporary-git-repository directory + '((add "a.txt" "A") + (commit "First commit") + (tag "v1.0" "release-1.0") + (branch "develop") + (checkout "develop") + (add "b.txt" "B") + (commit "Second commit") + (tag "v1.1" "release-1.1")) + (let ((directory commit relation + (update-cached-checkout directory + #:ref '(tag . "v1.1") + #:cache-directory cache)) + (head (let* ((pipe (open-pipe* OPEN_READ (git-command) + "-C" directory + "rev-parse" "HEAD")) + (str (get-string-all pipe))) + (close-pipe pipe) + (string-trim-right str)))) + ;; COMMIT should be the ID of the commit object, not that of the tag. + (string=? commit head)))))) + (test-end "git") diff --git a/tests/graph.scm b/tests/graph.scm index 6aa2d0e0ff..6674b5cc8f 100644 --- a/tests/graph.scm +++ b/tests/graph.scm @@ -24,7 +24,6 @@ #:use-module (guix derivations) #:use-module (guix store) #:use-module (guix monads) - #:use-module (guix grafts) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix gexp) diff --git a/tests/guix-build-branch.sh b/tests/guix-build-branch.sh index 79aa06a58f..7bf6a318ca 100644 --- a/tests/guix-build-branch.sh +++ b/tests/guix-build-branch.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2018, 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -54,7 +54,7 @@ test "$v0_1_0_drv" != "$orig_drv" v0_1_0_drv="`guix build guix --with-commit=guile-gcrypt=v0.1.0 -d`" guix gc -R "$v0_1_0_drv" | grep guile-gcrypt-0.1.0 -guix gc -R "$v0_1_0_drv" | grep guile-gcrypt-8fe64e8 # this is the tag ID +guix gc -R "$v0_1_0_drv" | grep guile-gcrypt-9e3eacd test "$v0_1_0_drv" != "$latest_drv" test "$v0_1_0_drv" != "$orig_drv" diff --git a/tests/guix-daemon.sh b/tests/guix-daemon.sh index 330ad68835..4b09c8c162 100644 --- a/tests/guix-daemon.sh +++ b/tests/guix-daemon.sh @@ -27,7 +27,7 @@ guix build --version drv="`guix build emacs -d`" out="`guile -c ' \ - (use-modules (guix) (guix grafts) (gnu packages emacs)) \ + (use-modules (guix) (gnu packages emacs)) \ (define store (open-connection)) \ (%graft? #f) (display (derivation->output-path (package-derivation store emacs)))'`" @@ -122,7 +122,7 @@ guix-daemon --no-substitutes --listen="$socket" --disable-chroot \ daemon_pid=$! guile -c " - (use-modules (guix) (guix grafts) (guix tests) (srfi srfi-34)) + (use-modules (guix) (guix tests) (srfi srfi-34)) (define store (open-connection-for-tests \"$socket\")) ;; Disable grafts to avoid building more than needed. diff --git a/tests/lint.scm b/tests/lint.scm index 8be74d2604..b848e32aee 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Alex Kost <alezost@gmail.com> @@ -35,6 +35,7 @@ #:use-module (guix tests http) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix svn-download) #:use-module (guix build-system texlive) #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) @@ -1085,6 +1086,35 @@ (and (? lint-warning?) second-warning)) (lint-warning-message second-warning))))))))) +(test-equal "source: svn-reference, HTTP 200" + '() + (with-http-server `((200 ,%long-string)) + (let ((pkg (package + (inherit (dummy-package "x")) + (source (origin + (method svn-fetch) + (uri (svn-reference + (url (%local-url)) + (revision 1234))) + (sha256 %null-sha256)))))) + (check-source pkg)))) + +(with-http-server `((404 ,%long-string)) + (test-equal "source: svn-reference, HTTP 404" + (format #f "URI ~a not reachable: 404 (\"Such is life\")" + (%local-url)) + (let ((pkg (package + (inherit (dummy-package "x")) + (source (origin + (method svn-fetch) + (uri (svn-reference + (url (%local-url)) + (revision 1234))) + (sha256 %null-sha256)))))) + (match (check-source pkg) + ((warning) + (lint-warning-message warning)))))) + (test-equal "mirror-url" '() (let ((source (origin diff --git a/tests/monads.scm b/tests/monads.scm index 19b74f4fb9..7f255f02bf 100644 --- a/tests/monads.scm +++ b/tests/monads.scm @@ -20,7 +20,6 @@ #:use-module (guix tests) #:use-module (guix store) #:use-module (guix monads) - #:use-module (guix grafts) #:use-module (guix derivations) #:use-module (guix packages) #:use-module (gnu packages) diff --git a/tests/pack.scm b/tests/pack.scm index 98bfedf21c..a4c388d93e 100644 --- a/tests/pack.scm +++ b/tests/pack.scm @@ -25,7 +25,6 @@ #:use-module (guix profiles) #:use-module (guix packages) #:use-module (guix monads) - #:use-module (guix grafts) #:use-module (guix tests) #:use-module (guix gexp) #:use-module (guix modules) diff --git a/tests/packages.scm b/tests/packages.scm index dc03b13417..a71eb1125d 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -23,7 +23,6 @@ #:use-module (guix tests) #:use-module (guix store) #:use-module (guix monads) - #:use-module (guix grafts) #:use-module (guix gexp) #:use-module (guix utils) #:use-module ((guix build utils) #:select (tarball?)) diff --git a/tests/profiles.scm b/tests/profiles.scm index 7bed946bf3..9ad03f2b24 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -23,7 +23,6 @@ #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix monads) - #:use-module (guix grafts) #:use-module (guix packages) #:use-module (guix derivations) #:use-module (guix build-system trivial) diff --git a/tests/system.scm b/tests/system.scm index 873fed4aee..876e15a25e 100644 --- a/tests/system.scm +++ b/tests/system.scm @@ -24,7 +24,6 @@ #:use-module (guix monads) #:use-module ((guix gexp) #:select (lower-object)) #:use-module ((guix utils) #:select (%current-system)) - #:use-module (guix grafts) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64)) |