Merge pull request #466 from tfutils/fix/456-457-test-bugs

Zordrak · web-flow · commit 343ed7bbd653 · 2026-04-24T13:10:31.000+01:00
Fix #456, Fix #457: Replace undefined error_and_die with error_and_proceed in test_uninstall.sh, fix missing quotes on TFENV_ROOT check in test_common.sh
diff --git a/test/test_common.sh b/test/test_common.sh
@@ -30,7 +30,7 @@ if [ -z "${TFENV_ROOT:-""}" ]; then
   };
 
   TFENV_ROOT="$(cd "$(dirname "$(readlink_f "${0}")")/.." && pwd)";
-  [ -n ${TFENV_ROOT} ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
+  [ -n "${TFENV_ROOT}" ] || early_death "Failed to 'cd \"\$(dirname \"\$(readlink_f \"${0}\")\")/..\" && pwd' while trying to determine TFENV_ROOT";
 else
   TFENV_ROOT="${TFENV_ROOT%/}";
 fi;
diff --git a/test/test_uninstall.sh b/test/test_uninstall.sh
@@ -49,7 +49,7 @@ for ((test_num=0; test_num<${tests_count}; ++test_num )) ; do
 done;
 
 echo "### Uninstall removes versions directory"
-cleanup || error_and_die "Cleanup failed?!"
+cleanup || error_and_proceed "Cleanup failed?!"
 (
   tfenv install 0.12.1 || exit 1
   tfenv install 0.12.2 || exit 1

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ for ((test_num=0; test_num<${tests_count}; ++test_num )) ; do`
`49`	`49`	`done;`
`50`	`50`
`51`	`51`	`echo "### Uninstall removes versions directory"`
`52`		`-cleanup \|\| error_and_die "Cleanup failed?!"`
	`52`	`+cleanup \|\| error_and_proceed "Cleanup failed?!"`
`53`	`53`	`(`
`54`	`54`	`tfenv install 0.12.1 \|\| exit 1`
`55`	`55`	`tfenv install 0.12.2 \|\| exit 1`