From: "Ludovic Courtès" <ludo@gnu.org>
To: 66793@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#66793] [PATCH 1/3] tests: Make ‘guix time-machine’ test effective.
Date: Sat, 28 Oct 2023 16:08:33 +0200 [thread overview]
Message-ID: <d55f09b93e2f727d841cd4fba075a1049738712f.1698501649.git.ludo@gnu.org> (raw)
In-Reply-To: <cover.1698501649.git.ludo@gnu.org>
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 | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/tests/guix-time-machine.sh b/tests/guix-time-machine.sh
index 8b62ef75ea..a78c1533fb 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,24 @@
# 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
+ 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
--
2.41.0
next prev parent reply other threads:[~2023-10-28 14:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-28 14:02 [bug#66793] [PATCH 0/3] Make time-machine commit check cheaper; make test effective Ludovic Courtès
2023-10-28 14:08 ` Ludovic Courtès [this message]
2023-10-31 15:06 ` [bug#66793] [PATCH 1/3] tests: Make ‘guix time-machine’ " Maxim Cournoyer
2023-11-05 20:49 ` Ludovic Courtès
2023-10-28 14:08 ` [bug#66793] [PATCH 2/3] time-machine: Make target commit check cheaper Ludovic Courtès
2023-10-31 15:15 ` Maxim Cournoyer
2023-11-05 22:28 ` bug#66793: " Ludovic Courtès
2023-10-28 14:08 ` [bug#66793] [PATCH 3/3] time-machine: Warn when no command is given Ludovic Courtès
2023-10-31 15:16 ` Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d55f09b93e2f727d841cd4fba075a1049738712f.1698501649.git.ludo@gnu.org \
--to=ludo@gnu.org \
--cc=66793@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.