[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: tests: Make ‘guix time-machine’ test effective.
From: |
guix-commits |
Subject: |
03/06: tests: Make ‘guix time-machine’ test effective. |
Date: |
Sun, 5 Nov 2023 17:26:16 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 9f05fbb67d0de4d577c21a6fb6888cb6be67cd12
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Oct 28 15:55:32 2023 +0200
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
---
tests/guix-time-machine.sh | 26 ++++++++++++++++++++++----
1 file 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
- branch master updated (286639c9af -> 08d94fe20e), guix-commits, 2023/11/05
- 04/06: time-machine: Make target commit check cheaper., guix-commits, 2023/11/05
- 03/06: tests: Make ‘guix time-machine’ test effective.,
guix-commits <=
- 01/06: tests: Honor system and target when lowering <system-test>., guix-commits, 2023/11/05
- 02/06: tests: inetd: Avoid race condition when looking for PID file., guix-commits, 2023/11/05
- 06/06: home: services: Add 'x11-display' service., guix-commits, 2023/11/05
- 05/06: time-machine: Warn when no command is given., guix-commits, 2023/11/05