diff options
| author | Eric Bavier <bavier@posteo.net> | 2023-04-20 00:11:27 -0500 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-04-21 16:16:38 +0200 |
| commit | 37dd69b44511dc73eb04bdebe8d82c9a0386338e (patch) | |
| tree | d20ecc2b15659ed2345f00beb39170a5365a7051 /tests/guix-gc.sh | |
| parent | a09c7da8f8d8e732f969cf0a09aaa78f87032ab1 (diff) | |
tests: Fix checks for expected failures.
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>
Diffstat (limited to 'tests/guix-gc.sh')
| -rw-r--r-- | tests/guix-gc.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/guix-gc.sh b/tests/guix-gc.sh index f40619876d4..675a13115d9 100644 --- a/tests/guix-gc.sh +++ b/tests/guix-gc.sh | |||
| @@ -36,11 +36,11 @@ unset out | |||
| 36 | # For some operations, passing extra arguments is an error. | 36 | # For some operations, passing extra arguments is an error. |
| 37 | for option in "" "-C 500M" "--verify" "--optimize" "--list-roots" | 37 | for option in "" "-C 500M" "--verify" "--optimize" "--list-roots" |
| 38 | do | 38 | do |
| 39 | ! guix gc $option whatever | 39 | guix gc $option whatever && false |
| 40 | done | 40 | done |
| 41 | 41 | ||
| 42 | # This should fail. | 42 | # This should fail. |
| 43 | ! guix gc --verify=foo | 43 | guix gc --verify=foo && false |
| 44 | 44 | ||
| 45 | # Check the references of a .drv. | 45 | # Check the references of a .drv. |
| 46 | drv="`guix build guile-bootstrap -d`" | 46 | drv="`guix build guile-bootstrap -d`" |
| @@ -51,7 +51,7 @@ guix gc --references "$drv" | grep -e -bash | |||
| 51 | guix gc --references "$out" | 51 | guix gc --references "$out" |
| 52 | guix gc --references "$out/bin/guile" | 52 | guix gc --references "$out/bin/guile" |
| 53 | 53 | ||
| 54 | ! guix gc --references /dev/null; | 54 | guix gc --references /dev/null && false |
| 55 | 55 | ||
| 56 | # Check derivers. | 56 | # Check derivers. |
| 57 | guix gc --derivers "$out" | grep "$drv" | 57 | guix gc --derivers "$out" | grep "$drv" |
| @@ -62,7 +62,7 @@ test -f "$drv" | |||
| 62 | 62 | ||
| 63 | guix gc --list-dead | grep "$drv" | 63 | guix gc --list-dead | grep "$drv" |
| 64 | guix gc --delete "$drv" | 64 | guix gc --delete "$drv" |
| 65 | ! test -f "$drv" | 65 | test ! -f "$drv" |
| 66 | 66 | ||
| 67 | # Add a .drv, register it as a root. | 67 | # Add a .drv, register it as a root. |
| 68 | drv="`guix build --root=guix-gc-root lsh -d`" | 68 | drv="`guix build --root=guix-gc-root lsh -d`" |
| @@ -71,18 +71,18 @@ test -f "$drv" && test -L guix-gc-root | |||
| 71 | guix gc --list-roots | grep "$PWD/guix-gc-root" | 71 | guix gc --list-roots | grep "$PWD/guix-gc-root" |
| 72 | 72 | ||
| 73 | guix gc --list-live | grep "$drv" | 73 | guix gc --list-live | grep "$drv" |
| 74 | ! guix gc --delete "$drv"; | 74 | guix gc --delete "$drv" && false |
| 75 | 75 | ||
| 76 | rm guix-gc-root | 76 | rm guix-gc-root |
| 77 | guix gc --list-dead | grep "$drv" | 77 | guix gc --list-dead | grep "$drv" |
| 78 | guix gc --delete "$drv" | 78 | guix gc --delete "$drv" |
| 79 | ! test -f "$drv" | 79 | test ! -f "$drv" |
| 80 | 80 | ||
| 81 | # Try a random collection. | 81 | # Try a random collection. |
| 82 | guix gc -C 1KiB | 82 | guix gc -C 1KiB |
| 83 | 83 | ||
| 84 | # Check trivial error cases. | 84 | # Check trivial error cases. |
| 85 | ! guix gc --delete /dev/null; | 85 | guix gc --delete /dev/null && false |
| 86 | 86 | ||
| 87 | # Bug #19757 | 87 | # Bug #19757 |
| 88 | out="`guix build guile-bootstrap`" | 88 | out="`guix build guile-bootstrap`" |
| @@ -90,14 +90,14 @@ test -d "$out" | |||
| 90 | 90 | ||
| 91 | guix gc --delete "$out" | 91 | guix gc --delete "$out" |
| 92 | 92 | ||
| 93 | ! test -d "$out" | 93 | test ! -d "$out" |
| 94 | 94 | ||
| 95 | out="`guix build guile-bootstrap`" | 95 | out="`guix build guile-bootstrap`" |
| 96 | test -d "$out" | 96 | test -d "$out" |
| 97 | 97 | ||
| 98 | guix gc --delete "$out/" | 98 | guix gc --delete "$out/" |
| 99 | 99 | ||
| 100 | ! test -d "$out" | 100 | test ! -d "$out" |
| 101 | 101 | ||
| 102 | out="`guix build guile-bootstrap`" | 102 | out="`guix build guile-bootstrap`" |
| 103 | test -d "$out" | 103 | test -d "$out" |
