Merge 8b9512bb35 into 6b70c40f15

Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

.github/workflows/tests.yml

@@ -1,6 +1,6 @@
 name: urchin tests
 
-on: [push]
+on: [pull_request, push]
 
 permissions:
   contents: read
@@ -31,6 +31,7 @@ jobs:
         suite:
           - install_script
           - sourcing
+          - slow
         shell:
           - sh
           - bash

.travis.yml

@@ -87,11 +87,6 @@ env:
     - SHELL=bash TEST_SUITE=fast
     - SHELL=zsh TEST_SUITE=fast
     #  - SHELL=ksh TEST_SUITE=fast
-    - SHELL=sh TEST_SUITE=slow
-    - SHELL=dash TEST_SUITE=slow
-    - SHELL=bash TEST_SUITE=slow
-    - SHELL=zsh TEST_SUITE=slow
-    #  - SHELL=ksh TEST_SUITE=slow
     - SHELL=sh TEST_SUITE=installation_iojs
     - SHELL=sh TEST_SUITE=installation_iojs WITHOUT_CURL=1
     - SHELL=dash TEST_SUITE=installation_iojs

nvm.sh

@@ -196,6 +196,9 @@ nvm_install_latest_npm() {
   nvm_echo 'Attempting to upgrade to the latest working version of npm...'
   local NODE_VERSION
   NODE_VERSION="$(nvm_strip_iojs_prefix "$(nvm_ls_current)")"
+  local NPM_VERSION
+  NPM_VERSION="$(npm --version 2>/dev/null)"
+
   if [ "${NODE_VERSION}" = 'system' ]; then
     NODE_VERSION="$(node --version)"
   elif [ "${NODE_VERSION}" = 'none' ]; then
@@ -206,8 +209,6 @@ nvm_install_latest_npm() {
     nvm_err 'Unable to obtain node version.'
     return 1
   fi
-  local NPM_VERSION
-  NPM_VERSION="$(npm --version 2>/dev/null)"
   if [ -z "${NPM_VERSION}" ]; then
     nvm_err 'Unable to obtain npm version.'
     return 2
@@ -700,10 +701,12 @@ nvm_ensure_version_installed() {
       nvm_err "N/A: version \"${PREFIXED_VERSION:-$PROVIDED_VERSION}\" is not yet installed."
     fi
     nvm_err ""
-    if [ "${IS_VERSION_FROM_NVMRC}" != '1' ]; then
-        nvm_err "You need to run \`nvm install ${PROVIDED_VERSION}\` to install and use it."
-      else
-        nvm_err 'You need to run `nvm install` to install and use the node version specified in `.nvmrc`.'
+    if [ "${PROVIDED_VERSION}" = 'lts' ]; then
+      nvm_err '`lts` is not an alias - you may need to run `nvm install --lts` to install and `nvm use --lts` to use it.'
+    elif [ "${IS_VERSION_FROM_NVMRC}" != '1' ]; then
+      nvm_err "You need to run \`nvm install ${PROVIDED_VERSION}\` to install and use it."
+    else
+      nvm_err 'You need to run `nvm install` to install and use the node version specified in `.nvmrc`.'
     fi
     return 1
   fi
@@ -891,6 +894,10 @@ nvm_normalize_lts() {
       fi
     ;;
     *)
+      if [ "${LTS}" != "$(echo "${LTS}" | command tr '[:upper:]' '[:lower:]')" ]; then
+        nvm_err 'LTS names must be lowercase'
+        return 3
+      fi
       nvm_echo "${LTS}"
     ;;
   esac
@@ -1249,7 +1256,9 @@ nvm_alias() {
     nvm_err 'An alias is required.'
     return 1
   fi
-  ALIAS="$(nvm_normalize_lts "${ALIAS}")"
+  if ! ALIAS="$(nvm_normalize_lts "${ALIAS}")"; then
+    return $?
+  fi
 
   if [ -z "${ALIAS}" ]; then
     return 2
@@ -1652,7 +1661,9 @@ $VERSION_LIST
 EOF
 
   if [ -n "${LTS-}" ]; then
-    LTS="$(nvm_normalize_lts "lts/${LTS}")"
+    if ! LTS="$(nvm_normalize_lts "lts/${LTS}")"; then
+      return $?
+    fi
     LTS="${LTS#lts/}"
   fi
 
@@ -3417,9 +3428,11 @@ nvm() {
         ;;
       esac
 
+      local EXIT_CODE
       VERSION="$(NVM_VERSION_ONLY=true NVM_LTS="${LTS-}" nvm_remote_version "${provided_version}")"
+      EXIT_CODE="$?"
 
-      if [ "${VERSION}" = 'N/A' ]; then
+      if [ "${VERSION}" = 'N/A' ] || [ $EXIT_CODE -ne 0 ]; then
         local LTS_MSG
         local REMOTE_CMD
         if [ "${LTS-}" = '*' ]; then
@@ -3428,6 +3441,10 @@ nvm() {
         elif [ -n "${LTS-}" ]; then
           LTS_MSG="(with LTS filter '${LTS}') "
           REMOTE_CMD="nvm ls-remote --lts=${LTS}"
+          if [ -z "${provided_version}" ]; then
+            nvm_err "Version with LTS filter '${LTS}' not found - try \`${REMOTE_CMD}\` to browse available versions."
+            return 3
+          fi
         else
           REMOTE_CMD='nvm ls-remote'
         fi
@@ -3492,7 +3509,6 @@ nvm() {
         FLAVOR="$(nvm_node_prefix)"
       fi
 
-      local EXIT_CODE
       EXIT_CODE=0
 
       if nvm_is_version_installed "${VERSION}"; then

test/fast/Unit tests/nvm install with nonlowercase LTS name

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+die () { echo "$@" ; exit 1; }
+
+\. ../../../nvm.sh
+
+REMOTE="${PWD}/mocks/nvm_ls_remote.txt"
+REMOTE_IOJS="${PWD}/mocks/nvm_ls_remote_iojs.txt"
+
+nvm_download() {
+  if [ "$*" = "-L -s $(nvm_get_mirror node std)/index.tab -o -" ]; then
+    cat "${REMOTE}"
+  elif [ "$*" = "-L -s $(nvm_get_mirror iojs)/index.tab -o -" ]; then
+    cat "${REMOTE_IOJS}"
+  else
+    nvm_err "unknown nvm_download call: $*"
+    return 42
+  fi
+}
+
+nvm_install_binary() {
+  return 42
+}
+nvm_install_source() {
+  return 42
+}
+
+ACTUAL="$(nvm install lts/ARGON 2>&1)"
+EXIT_CODE=$?
+[ $EXIT_CODE -eq 3 ] || die "Expected exit code of 3, got ${EXIT_CODE}"
+
+EXPECTED="LTS names must be lowercase
+Version with LTS filter 'ARGON' not found - try \`nvm ls-remote --lts=ARGON\` to browse available versions."
+
+[ "${ACTUAL}" = "${EXPECTED}" ] || die "Expected >${EXPECTED}<, got >${ACTUAL}<"

test/fast/Unit tests/nvm ls-remote

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-set -e
-
 die () { echo "$@" ; cleanup ; exit 1; }
 
 cleanup() {
@@ -56,6 +54,14 @@ printf '%s\n' "${LTS_LIST}" | while IFS= read -r LTS; do
   INDEX=$(($INDEX + 1))
 done
 
+OUTPUT="$(nvm ls-remote lts/ARGON 2>&1)"
+EXIT_CODE=$?
+[ $EXIT_CODE -eq 3 ] || die "nvm ls-remote lts/ARGON did not exit 3, got '${EXIT_CODE}'"
+
+EXPECTED_OUTPUT="LTS names must be lowercase
+            N/A"
+[ "_${OUTPUT}" = "_${EXPECTED_OUTPUT}" ] || die "nvm ls-remote lts/ARGON did not output expected error message; got >${OUTPUT}< expected >${EXPECTED_OUTPUT}<"
+
 REMOTE="${PWD}/mocks/nvm_ls_remote.txt"
 nvm_ls_remote() {
   cat "${REMOTE}"

test/fast/Unit tests/nvm_install_no_progress_bar

@@ -6,7 +6,7 @@ cleanup () {
   nvm cache clear
   nvm deactivate
   rm -rf ${NVM_DIR}/v*
-  nvm unalias default
+  nvm unalias default || true
 }
 
 die () { >&2 echo "$@" ; cleanup ; exit 1; }

test/fast/Unit tests/nvm_normalize_lts

@@ -16,6 +16,9 @@ ACTUAL="$(nvm_normalize_lts "lts/*")"
 EXPECTED='lts/*'
 [ "${ACTUAL}" = "${EXPECTED}" ] || die "expected >${EXPECTED}<, got >${ACTUAL}<"
 
+if ACTUAL="$(nvm_normalize_lts lts/ARGON)"; then
+  die "expected failure, got >${ACTUAL}<"
+fi
 
 MOCKS_DIR="../Unit tests/mocks"
 STAR="$(cat "$MOCKS_DIR/lts-star.txt")"

test/installation_node/install LTS

@@ -9,20 +9,20 @@ die () { echo "$@" ; exit 1; }
 nvm unalias default >/dev/null 2>&1 || die 'unable to unalias default'
 
 set +ex # needed for stderr
-OUTPUT="$(nvm install --lts 3 2>&1)"
+OUTPUT="$(nvm install --lts 0.12 2>&1)"
+EXIT_CODE="$?"
 set -ex
-EXIT_CODE="$(nvm install --lts 3 >/dev/null 2>&1 && echo $? || echo $?)"
-EXPECTED_OUTPUT="Version '3' (with LTS filter) not found - try \`nvm ls-remote --lts\` to browse available versions."
-[ "${EXIT_CODE}" = 3 ] || die "\`nvm install --lts 3\` did not exit with 3, got >${EXIT_CODE}<"
+EXPECTED_OUTPUT="Version '0.12' (with LTS filter) not found - try \`nvm ls-remote --lts\` to browse available versions."
+[ "${EXIT_CODE}" = 3 ] || die "\`nvm install --lts 0.12\` did not exit with 3, got >${EXIT_CODE}<"
 [ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "\`nvm install --lts 3\` output >${OUTPUT}<, expected >${EXPECTED_OUTPUT}<"
 
 set +ex # needed for stderr
-OUTPUT="$(nvm install --lts=argon 3 2>&1)"
-set -ex
-EXIT_CODE="$(nvm install --lts=argon 3 >/dev/null 2>&1 && echo $? || echo $?)"
-EXPECTED_OUTPUT="Version '3' (with LTS filter 'argon') not found - try \`nvm ls-remote --lts=argon\` to browse available versions."
-[ "${EXIT_CODE}" = 3 ] || die "\`nvm install --lts=argon 3\` did not exit with 3, got >${EXIT_CODE}<"
-[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "\`nvm install --lts=argon 3\` output >${OUTPUT}<, expected >${EXPECTED_OUTPUT}<"
+OUTPUT="$(nvm install --lts=argon 0.12 2>&1)"
+EXIT_CODE="$?"
+set -x
+EXPECTED_OUTPUT="Version '0.12' (with LTS filter 'argon') not found - try \`nvm ls-remote --lts=argon\` to browse available versions."
+[ "${EXIT_CODE}" = 3 ] || die "\`nvm install --lts=argon 0.12\` did not exit with 3, got >${EXIT_CODE}<"
+[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "\`nvm install --lts=argon 0.12\` output >${OUTPUT}<, expected >${EXPECTED_OUTPUT}<"
 
 nvm install --lts 4.2.2 || die 'nvm install --lts 4.2.2 failed'
 

test/slow/nvm use/Running 'nvm use lts' shows actionable error

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -ex
+
+die () { echo "$@" ; exit 1; }
+
+\. ../../../nvm.sh
+
+# Deactivate any active node version
+nvm deactivate >/dev/null 2>&1 || die 'deactivate failed'
+
+# Attempt to use 'lts' without '--' and capture the error message
+ERROR_OUTPUT=$(nvm use lts 2>&1) || true
+
+EXPECTED_ERROR='`lts` is not an alias - you may need to run `nvm install --lts` to install and `nvm use --lts` to use it.'
+
+# Check if the error message matches the expected output
+echo "$ERROR_OUTPUT" | grep -q "$EXPECTED_ERROR" \
+  || die "Expected error message not found. Got: $ERROR_OUTPUT"