Merge cbaffd8eca7f7a202ad3bc19cd291e568c55f4a7 into 6b70c40f151ca051d403453bf019e1707b33bd5b

test/fast/Unit tests/nvm ls-remote

@@ -8,8 +8,6 @@ cleanup() {
     export NVM_COLORS=TEMP_NVM_COLORS
   fi
   unset TEMP_NVM_COLORS
-  rm -rf "${NVM_DIR}/alias/lts"
-  mv "${NVM_DIR}/alias/lts-backup" "${NVM_DIR}/alias/lts"
 }
 
 \. ../../../nvm.sh
@@ -18,24 +16,12 @@ if [ -n "${NVM_COLORS-}" ]; then
   unset NVM_COLORS
 fi
 
-MOCKS_DIR="../Unit tests/mocks"
-
-LTS_NAMES_PATH="${MOCKS_DIR}/LTS_names.txt"
-
-STAR="$(cat "${MOCKS_DIR}/lts-star.txt")"
-
-mv "${NVM_DIR}/alias/lts" "${NVM_DIR}/alias/lts-backup" ||:
-mkdir -p "${NVM_DIR}/alias/lts"
-
-echo "${STAR}" > "${NVM_DIR}/alias/lts/\*"
-printf '%s\n' "$(cat "${LTS_NAMES_PATH}" | tail -n +1)" | while IFS= read -r LTS; do
-  cp "${NVM_DIR}/alias/lts-backup/${LTS}" "${NVM_DIR}/alias/lts/"
-done
-
 nvm deactivate 2>/dev/null || die 'unable to deactivate'
 
 \. ../../common.sh
 
+MOCKS_DIR="${PWD}/mocks"
+
 nvm_download() {
   if [ "$*" = "-L -s $(nvm_get_mirror node std)/index.tab -o -" ]; then
     cat "${MOCKS_DIR}/nodejs.org-dist-index.tab"
@@ -54,6 +40,8 @@ OUTPUT="$(nvm ls-remote "lts/*" | sed 's/[ \t]*$//')"
 EXPECTED_OUTPUT="$(cat "${EXPECTED_OUTPUT_PATH}" | sed 's/[ \t]*$//' )"
 [ "_${OUTPUT}" = "_${EXPECTED_OUTPUT}" ] || die "nvm ls-remote lts/* did not output expected sorted versions; got >${OUTPUT}< expected >${EXPECTED_OUTPUT}<"
 
+MOCKS_DIR="${PWD}/mocks"
+LTS_NAMES_PATH="${MOCKS_DIR}/LTS_names.txt"
 LTS_LIST="$(cat "${LTS_NAMES_PATH}" | tail -n +2)"
 
 INDEX=1

test/fast/Unit tests/nvm_alias LTS-N

@@ -5,26 +5,14 @@ die () { echo "$@" ; cleanup ; exit 1; }
 
 cleanup() {
   unset -f nvm_download
-  rm -rf "${NVM_DIR}/alias/lts"
-  mv "${NVM_DIR}/alias/lts-backup" "${NVM_DIR}/alias/lts"
 }
 
 \. ../../../nvm.sh
 
-MOCKS_DIR="${PWD}/mocks"
-
-LTS_NAMES_PATH="${MOCKS_DIR}/LTS_names.txt"
-LTS_LIST="$(cat "${LTS_NAMES_PATH}" | tail -n +2)"
-
-mv "${NVM_DIR}/alias/lts" "${NVM_DIR}/alias/lts-backup" ||:
-mkdir -p "${NVM_DIR}/alias/lts"
-
-for LTS in $LTS_LIST; do
-  cp "${NVM_DIR}/alias/lts-backup/${LTS}" "${NVM_DIR}/alias/lts/"
-done
-
 set -ex
 
+MOCKS_DIR="${PWD}/mocks"
+
 # sample output at the time the test was written
 TAB_PATH="${MOCKS_DIR}/nodejs.org-dist-index.tab"
 nvm_download() {
@@ -33,6 +21,8 @@ nvm_download() {
 
 nvm_ls_remote >/dev/null || die "nvm_ls_remote_failed?!"
 
+LTS_NAMES_PATH="${MOCKS_DIR}/LTS_names.txt"
+
 N=0
 while IFS= read -r LTS; do
   if [ $N -gt 0 ]; then

test/fast/Unit tests/nvm_normalize_lts

@@ -2,44 +2,32 @@
 
 cleanup() {
     unset nvm_get_os
-    rm -rf "${NVM_DIR}/alias/lts"
-    mv "${NVM_DIR}/alias/lts-backup" "${NVM_DIR}/alias/lts"
 }
 
 die () { cleanup; echo "$@" ; exit 1; }
 
 \. ../../../nvm.sh
 
-MOCKS_DIR="../Unit tests/mocks"
-
-LTS_NAMES_PATH="${MOCKS_DIR}/LTS_names.txt"
-
-STAR="$(cat "${MOCKS_DIR}/lts-star.txt")"
-
-mv "${NVM_DIR}/alias/lts" "${NVM_DIR}/alias/lts-backup" ||:
-mkdir -p "${NVM_DIR}/alias/lts"
-
-echo "${STAR}" > "${NVM_DIR}/alias/lts/\*"
-printf '%s\n' "$(cat "${LTS_NAMES_PATH}" | tail -n +1)" | while IFS= read -r LTS; do
-  cp "${NVM_DIR}/alias/lts-backup/${LTS}" "${NVM_DIR}/alias/lts/"
-done
-
 ACTUAL="$(nvm_normalize_lts "foo")"
 EXPECTED='foo'
-[ "${ACTUAL}" = "${EXPECTED}" ] || die "foo: expected >${EXPECTED}<, got >${ACTUAL}<"
+[ "${ACTUAL}" = "${EXPECTED}" ] || die "expected >${EXPECTED}<, got >${ACTUAL}<"
 
 ACTUAL="$(nvm_normalize_lts "lts/*")"
 EXPECTED='lts/*'
-[ "${ACTUAL}" = "${EXPECTED}" ] || die "*: expected >${EXPECTED}<, got >${ACTUAL}<"
+[ "${ACTUAL}" = "${EXPECTED}" ] || die "expected >${EXPECTED}<, got >${ACTUAL}<"
 
 if ACTUAL="$(nvm_normalize_lts lts/ARGON)"; then
-  die "ARGON: expected failure, got >${ACTUAL}<"
+  die "expected failure, got >${ACTUAL}<"
 fi
 
+MOCKS_DIR="../Unit tests/mocks"
+STAR="$(cat "$MOCKS_DIR/lts-star.txt")"
+
 ACTUAL="$(nvm_normalize_lts "${STAR}")"
 EXPECTED="${STAR}"
-[ "${ACTUAL}" = "${EXPECTED}" ] || die "${STAR}: expected >${EXPECTED}<, got >${ACTUAL}<"
+[ "${ACTUAL}" = "${EXPECTED}" ] || die "expected >${EXPECTED}<, got >${ACTUAL}<"
 
+LTS_NAMES_PATH="${MOCKS_DIR}/LTS_names.txt"
 LTS_LIST="$(cat "${LTS_NAMES_PATH}" | tail -n +2)"
 
 INDEX=1
@@ -51,4 +39,3 @@ printf '%s\n' "${LTS_LIST}" | while IFS= read -r LTS; do
 
     INDEX=$(($INDEX + 1))
 done
-