diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2023-10-28 15:55:32 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-11-05 23:23:23 +0100 |
| commit | 9f05fbb67d0de4d577c21a6fb6888cb6be67cd12 (patch) | |
| tree | 8445fc33d30529215161dffa5fc1da627bda97db | |
| parent | 31b39f2a336270048574ede1ed1619ff11f95a0a (diff) | |
| download | guix-9f05fbb67d0de4d577c21a6fb6888cb6be67cd12.tar.gz guix-9f05fbb67d0de4d577c21a6fb6888cb6be67cd12.zip | |
tests: Make ‘guix time-machine’ test effective.
The test as added in 79ec651a286c71a3d4c72be33a1f80e76a560031 had no
effect: first because ‘guix time-machine --commit=X’, not followed by a
command, does nothing, and second because the “! COMMAND” shell stanza
does not have the desired effect (see <https://issues.guix.gnu.org/62406>).
This change rewrites the test to make it effective.
* tests/guix-time-machine.sh: Rewrite.
Change-Id: Ib44a11331c8625e346139a236cffa699cdbd02f2
| -rw-r--r-- | tests/guix-time-machine.sh | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/tests/guix-time-machine.sh b/tests/guix-time-machine.sh index 8b62ef75ea..983f796225 100644 --- a/tests/guix-time-machine.sh +++ b/tests/guix-time-machine.sh @@ -1,5 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> +# Copyright © 2023 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -20,9 +21,26 @@ # Test the 'guix time-machine' command-line utility. # -guix time-machine --version +if [ -d "$abs_top_srcdir/.git" ] \ + || guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null +then + guix time-machine --version +else + echo "This test requires networking or a local Git checkout; skipping." >&2 + exit 77 +fi -# Visiting a commit older than v1.0.0 fails. -! guix time-machine --commit=v0.15.0 +if [ -d "$abs_top_srcdir/.git" ] +then + # Note: No "file://" prefix because that makes cloning much more expensive + # for some reason. + EXTRA_OPTIONS="--url=$abs_top_srcdir" +else + EXTRA_OPTIONS="" +fi -exit 0 +# Visiting a commit older than v1.0.0 must fail (this test is expensive +# because it clones the whole repository). +guix time-machine -q --commit=v0.15.0 $EXTRA_OPTIONS -- describe && false + +true |