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-home.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-home.sh')
| -rw-r--r-- | tests/guix-home.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/guix-home.sh b/tests/guix-home.sh index 11b068ca43..e9ef76c862 100644 --- a/tests/guix-home.sh +++ b/tests/guix-home.sh @@ -109,7 +109,7 @@ EOF guix home extension-graph "home.scm" | grep 'label = "home"' # There are no Shepherd services so the one below must fail. - ! guix home shepherd-graph "home.scm" + guix home shepherd-graph "home.scm" && false if container_supported then @@ -118,17 +118,17 @@ EOF # TODO: Make container independent from external environment variables. SHELL=bash guix home container home.scm -- true - ! guix home container home.scm -- false + guix home container home.scm -- false && false test "$(guix home container home.scm -- echo '$HOME')" = "$HOME" guix home container home.scm -- cat '~/.config/test.conf' | \ grep "the content of" guix home container home.scm -- test -h '~/.bashrc' test "$(guix home container home.scm -- id -u)" = 1000 - ! guix home container home.scm -- test -f '$HOME/sample/home.scm' + guix home container home.scm -- test -f '$HOME/sample/home.scm' && false guix home container home.scm --expose="$PWD=$HOME/sample" -- \ test -f '$HOME/sample/home.scm' - ! guix home container home.scm --expose="$PWD=$HOME/sample" -- \ - rm -v '$HOME/sample/home.scm' + guix home container home.scm --expose="$PWD=$HOME/sample" -- \ + rm -v '$HOME/sample/home.scm' && false else echo "'guix home container' test SKIPPED" >&2 fi @@ -206,8 +206,8 @@ EOF # the NEW content of bashrc-test-config.sh" # This file must have been removed and not backed up. - ! test -e "$HOME/.config/test.conf" - ! test -e "$HOME"/*guix-home*backup/.config/test.conf + test ! -e "$HOME/.config/test.conf" + test ! -e "$HOME"/*guix-home*backup/.config/test.conf test "$(cat "$(configuration_file)")" == "$(cat home.scm)" test "$(canonical_file_name)" == "$(readlink "${HOME}/.guix-home")" |