tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 13:10:33 +02:00
Code Activity

tests: Fix checks for expected failures.

Browse Source 
Addresses <https://issues.guix.gnu.org/62406>.

With 'set -e', a return status inverted with '!' does not cause the shell to
exit immediately.  Instead use '&& false' to indicate an expected failure.

* tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh,
tests/guix-daemon.sh, tests/guix-download.sh,
tests/guix-environment-container.sh, tests/guix-environment.sh,
tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh,
tests/guix-hash.sh, tests/guix-home.sh, tests/guix-pack-relocatable.sh,
tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh,
tests/guix-package.sh, tests/guix-refresh.sh, tests/guix-shell.sh,
tests/guix-style.sh, tests/guix-system.sh: Replace uses of '! ...' with
'... && false' or `test ! ...` as appropriate.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Eric Bavier
2023-04-20 00:11:27 -05:00
committed by Ludovic Courtès
parent a09c7da8f8
commit 37dd69b445
21 changed files with 117 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/guix-gc.sh
View File

@@ -36,11 +36,11 @@ unset out
# For some operations, passing extra arguments is an error.
for option in "" "-C 500M" "--verify" "--optimize" "--list-roots"
do
! guix gc $option whatever
guix gc $option whatever && false
done
# This should fail.
! guix gc --verify=foo
guix gc --verify=foo && false
# Check the references of a .drv.
drv="`guix build guile-bootstrap -d`"
@@ -51,7 +51,7 @@ guix gc --references "$drv" | grep -e -bash
guix gc --references "$out"
guix gc --references "$out/bin/guile"
! guix gc --references /dev/null;
guix gc --references /dev/null && false
# Check derivers.
guix gc --derivers "$out" | grep "$drv"
@@ -62,7 +62,7 @@ test -f "$drv"
guix gc --list-dead | grep "$drv"
guix gc --delete "$drv"
! test -f "$drv"
test ! -f "$drv"
# Add a .drv, register it as a root.
drv="`guix build --root=guix-gc-root lsh -d`"
@@ -71,18 +71,18 @@ test -f "$drv" && test -L guix-gc-root
guix gc --list-roots | grep "$PWD/guix-gc-root"
guix gc --list-live | grep "$drv"
! guix gc --delete "$drv";
guix gc --delete "$drv" && false
rm guix-gc-root
guix gc --list-dead | grep "$drv"
guix gc --delete "$drv"
! test -f "$drv"
test ! -f "$drv"
# Try a random collection.
guix gc -C 1KiB
# Check trivial error cases.
! guix gc --delete /dev/null;
guix gc --delete /dev/null && false
# Bug #19757
out="`guix build guile-bootstrap`"
@@ -90,14 +90,14 @@ test -d "$out"
guix gc --delete "$out"
! test -d "$out"
test ! -d "$out"
out="`guix build guile-bootstrap`"
test -d "$out"
guix gc --delete "$out/"
! test -d "$out"
test ! -d "$out"
out="`guix build guile-bootstrap`"
test -d "$out"