tests: Relax two tests that expected a non-zero error code.

* tests/guix-package-aliases.sh: "guix upgrade foo bar" has always
returned zero; adjust accordingly.
* tests/guix-refresh.sh: "guix refresh -t test idutils" and similar
return zero; adjust accordingly.
This commit is contained in:
Ludovic Courtès 2023-04-21 16:55:29 +02:00
parent 37dd69b445
commit 61a6b05850
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 4 additions and 4 deletions

View file

@ -48,7 +48,7 @@ grep "libreoffice=inkscape" "$profile/manifest"
guix upgrade --version guix upgrade --version
guix upgrade -n guix upgrade -n
guix upgrade gui.e -n guix upgrade gui.e -n
guix upgrade foo bar -n && false guix upgrade foo bar -n
guix remove --version guix remove --version
guix remove --bootstrap guile-bootstrap -p "$profile" guix remove --bootstrap guile-bootstrap -p "$profile"

View file

@ -37,12 +37,12 @@ GUIX_TEST_UPDATER_TARGETS='
("the-test-package" "" (("5.5" "file://'$PWD/$module_dir'/source"))))' ("the-test-package" "" (("5.5" "file://'$PWD/$module_dir'/source"))))'
# No newer version available. # No newer version available.
guix refresh -t test idutils && false guix refresh -t test idutils # XXX: should return non-zero?
case "$(guix refresh -t test idutils 2>&1)" in case "$(guix refresh -t test idutils 2>&1)" in
*"$idutils_version"*"already the latest version"*) true;; *"$idutils_version"*"already the latest version"*) true;;
*) false;; *) false;;
esac esac
guix refresh -t test libreoffice && false guix refresh -t test libreoffice # XXX: should return non-zero?
case "$(guix refresh -t test libreoffice 2>&1)" in case "$(guix refresh -t test libreoffice 2>&1)" in
*"greater than the latest known version"*"1.0"*) true;; *"greater than the latest known version"*"1.0"*) true;;
*) false;; *) false;;
@ -100,7 +100,7 @@ grep 'version "5.5"' "$module_dir/sample.scm"
grep "$(guix hash -H sha256 -f nix-base32 "$module_dir/source")" "$module_dir/sample.scm" grep "$(guix hash -H sha256 -f nix-base32 "$module_dir/source")" "$module_dir/sample.scm"
# Specifying a target version. # Specifying a target version.
guix refresh -t test guile=2.0.0 && false guix refresh -t test guile=2.0.0 # XXX: should return non-zero?
case "$(guix refresh -t test guile=2.0.0 2>&1)" in case "$(guix refresh -t test guile=2.0.0 2>&1)" in
*"failed to find"*"2.0.0"*) true;; *"failed to find"*"2.0.0"*) true;;
*) false;; *) false;;