From 61a6b05850f99dcff65c83585c97604466d4ecf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 21 Apr 2023 16:55:29 +0200 Subject: [PATCH] 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. --- tests/guix-package-aliases.sh | 2 +- tests/guix-refresh.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/guix-package-aliases.sh b/tests/guix-package-aliases.sh index f68d24b9a7..4011584078 100644 --- a/tests/guix-package-aliases.sh +++ b/tests/guix-package-aliases.sh @@ -48,7 +48,7 @@ grep "libreoffice=inkscape" "$profile/manifest" guix upgrade --version guix upgrade -n guix upgrade gui.e -n -guix upgrade foo bar -n && false +guix upgrade foo bar -n guix remove --version guix remove --bootstrap guile-bootstrap -p "$profile" diff --git a/tests/guix-refresh.sh b/tests/guix-refresh.sh index 1167703b74..691020b031 100644 --- a/tests/guix-refresh.sh +++ b/tests/guix-refresh.sh @@ -37,12 +37,12 @@ GUIX_TEST_UPDATER_TARGETS=' ("the-test-package" "" (("5.5" "file://'$PWD/$module_dir'/source"))))' # 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 *"$idutils_version"*"already the latest version"*) true;; *) false;; 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 *"greater than the latest known version"*"1.0"*) true;; *) 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" # 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 *"failed to find"*"2.0.0"*) true;; *) false;;