Browse Source

Merge pull request #524 from creationix/run_installation_tests_separately

Run installation tests separately
master
Jordan Harband 11 years ago
parent
commit
a4da8a48ef
  1. 20
      .travis.yml
  2. 3
      package.json
  3. 6
      test/installation/install already installed uses it
  4. 6
      test/installation/install from binary
  5. 6
      test/installation/install from source
  6. 10
      test/installation/install two versions and use the latest one
  7. 6
      test/installation/install version specified in .nvmrc from binary
  8. 6
      test/installation/install version specified in .nvmrc from source
  9. 0
      test/installation/setup_dir
  10. 2
      test/installation/teardown_dir

20
.travis.yml

@ -10,20 +10,22 @@ script:
- NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin $SHELL - NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin $SHELL
env: env:
- SHELL=sh TEST_SUITE=fast - SHELL=sh TEST_SUITE=fast
- SHELL=sh TEST_SUITE=fast WITHOUT_CURL=1
- SHELL=dash TEST_SUITE=fast - SHELL=dash TEST_SUITE=fast
- SHELL=dash TEST_SUITE=fast WITHOUT_CURL=1
- SHELL=bash TEST_SUITE=fast - SHELL=bash TEST_SUITE=fast
- SHELL=bash TEST_SUITE=fast WITHOUT_CURL=1
- SHELL=zsh TEST_SUITE=fast - SHELL=zsh TEST_SUITE=fast
- SHELL=zsh TEST_SUITE=fast WITHOUT_CURL=1
- SHELL=ksh TEST_SUITE=fast - SHELL=ksh TEST_SUITE=fast
- SHELL=ksh TEST_SUITE=fast WITHOUT_CURL=1
- SHELL=sh TEST_SUITE=slow - SHELL=sh TEST_SUITE=slow
- SHELL=sh TEST_SUITE=slow WITHOUT_CURL=1
- SHELL=dash TEST_SUITE=slow - SHELL=dash TEST_SUITE=slow
- SHELL=dash TEST_SUITE=slow WITHOUT_CURL=1
- SHELL=bash TEST_SUITE=slow - SHELL=bash TEST_SUITE=slow
- SHELL=bash TEST_SUITE=slow WITHOUT_CURL=1
- SHELL=zsh TEST_SUITE=slow - SHELL=zsh TEST_SUITE=slow
- SHELL=zsh TEST_SUITE=slow WITHOUT_CURL=1 - SHELL=ksh TEST_SUITE=slow
- SHELL=sh TEST_SUITE=installation
- SHELL=sh TEST_SUITE=installation WITHOUT_CURL=1
- SHELL=dash TEST_SUITE=installation
- SHELL=dash TEST_SUITE=installation WITHOUT_CURL=1
- SHELL=bash TEST_SUITE=installation
- SHELL=bash TEST_SUITE=installation WITHOUT_CURL=1
- SHELL=zsh TEST_SUITE=installation
- SHELL=zsh TEST_SUITE=installation WITHOUT_CURL=1
- SHELL=ksh TEST_SUITE=installation
- SHELL=ksh TEST_SUITE=installation WITHOUT_CURL=1

3
package.json

@ -8,7 +8,8 @@
"scripts": { "scripts": {
"test": "urchin test", "test": "urchin test",
"test/fast": "urchin -f test/fast", "test/fast": "urchin -f test/fast",
"test/slow": "urchin -f test/slow" "test/slow": "urchin -f test/slow",
"test/installation": "urchin -f test/installation"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

6
test/slow/nvm install/install already installed uses it → test/installation/install already installed uses it

@ -2,13 +2,13 @@
die () { echo $@ ; exit 1; } die () { echo $@ ; exit 1; }
. ../../../nvm.sh . ../../nvm.sh
[ "$(nvm install invalid.invalid 2>&1)" = "Version 'invalid.invalid' not found - try \`nvm ls-remote\` to browse available versions." ] || die "nvm installing an invalid version did not print a nice error message" [ "$(nvm install invalid.invalid 2>&1)" = "Version 'invalid.invalid' not found - try \`nvm ls-remote\` to browse available versions." ] || die "nvm installing an invalid version did not print a nice error message"
# Remove the stuff we're clobbering. # Remove the stuff we're clobbering.
[ -e ../../../v0.9.7 ] && rm -R ../../../v0.9.7 [ -e ../../v0.9.7 ] && rm -R ../../v0.9.7
[ -e ../../../v0.9.12 ] && rm -R ../../../v0.9.12 [ -e ../../v0.9.12 ] && rm -R ../../v0.9.12
# Install from binary # Install from binary
nvm install 0.9.7 nvm install 0.9.7

6
test/slow/nvm install/install from binary → test/installation/install from binary

@ -1,17 +1,17 @@
#!/bin/sh #!/bin/sh
set -e set -e
. ../../../nvm.sh . ../../nvm.sh
NVM_TEST_VERSION=v0.10.7 NVM_TEST_VERSION=v0.10.7
# Remove the stuff we're clobbering. # Remove the stuff we're clobbering.
[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION [ -e ../../$NVM_TEST_VERSION ] && rm -R ../../$NVM_TEST_VERSION
# Install from binary # Install from binary
nvm install $NVM_TEST_VERSION nvm install $NVM_TEST_VERSION
# Check # Check
[ -d ../../../$NVM_TEST_VERSION ] [ -d ../../$NVM_TEST_VERSION ]
nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION

6
test/slow/nvm install/install from source → test/installation/install from source

@ -1,17 +1,17 @@
#!/bin/sh #!/bin/sh
set -e set -e
. ../../../nvm.sh . ../../nvm.sh
NVM_TEST_VERSION=v0.10.7 NVM_TEST_VERSION=v0.10.7
# Remove the stuff we're clobbering. # Remove the stuff we're clobbering.
[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION [ -e ../../$NVM_TEST_VERSION ] && rm -R ../../$NVM_TEST_VERSION
# Install from source # Install from source
nvm install -s $NVM_TEST_VERSION nvm install -s $NVM_TEST_VERSION
# Check # Check
[ -d ../../../$NVM_TEST_VERSION ] [ -d ../../$NVM_TEST_VERSION ]
nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION

10
test/slow/nvm install/install two versions and use the latest one → test/installation/install two versions and use the latest one

@ -1,19 +1,19 @@
#!/bin/sh #!/bin/sh
set -e set -e
. ../../../nvm.sh . ../../nvm.sh
# Remove the stuff we're clobbering. # Remove the stuff we're clobbering.
[ -e ../../../v0.9.7 ] && rm -R ../../../v0.9.7 [ -e ../../v0.9.7 ] && rm -R ../../v0.9.7
[ -e ../../../v0.9.12 ] && rm -R ../../../v0.9.12 [ -e ../../v0.9.12 ] && rm -R ../../v0.9.12
# Install from binary # Install from binary
nvm install 0.9.7 nvm install 0.9.7
nvm i 0.9.12 nvm i 0.9.12
# Check # Check
[ -d ../../../v0.9.7 ] [ -d ../../v0.9.7 ]
[ -d ../../../v0.9.12 ] [ -d ../../v0.9.12 ]
# Use the first one # Use the first one
nvm use 0.9.7 nvm use 0.9.7

6
test/slow/nvm install/install version specified in .nvmrc from binary → test/installation/install version specified in .nvmrc from binary

@ -1,12 +1,12 @@
#!/bin/sh #!/bin/sh
set -e set -e
. ../../../nvm.sh . ../../nvm.sh
NVM_TEST_VERSION=v0.10.7 NVM_TEST_VERSION=v0.10.7
# Remove the stuff we're clobbering. # Remove the stuff we're clobbering.
[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION [ -e ../../$NVM_TEST_VERSION ] && rm -R ../../$NVM_TEST_VERSION
# Install from binary # Install from binary
echo "$NVM_TEST_VERSION" > .nvmrc echo "$NVM_TEST_VERSION" > .nvmrc
@ -14,7 +14,7 @@ echo "$NVM_TEST_VERSION" > .nvmrc
nvm install nvm install
# Check # Check
[ -d ../../../$NVM_TEST_VERSION ] [ -d ../../$NVM_TEST_VERSION ]
nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION

6
test/slow/nvm install/install version specified in .nvmrc from source → test/installation/install version specified in .nvmrc from source

@ -1,12 +1,12 @@
#!/bin/sh #!/bin/sh
set -e set -e
. ../../../nvm.sh . ../../nvm.sh
NVM_TEST_VERSION=v0.10.7 NVM_TEST_VERSION=v0.10.7
# Remove the stuff we're clobbering. # Remove the stuff we're clobbering.
[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION [ -e ../../$NVM_TEST_VERSION ] && rm -R ../../$NVM_TEST_VERSION
# Install from binary # Install from binary
echo "$NVM_TEST_VERSION" > .nvmrc echo "$NVM_TEST_VERSION" > .nvmrc
@ -14,7 +14,7 @@ echo "$NVM_TEST_VERSION" > .nvmrc
nvm install -s nvm install -s
# Check # Check
[ -d ../../../$NVM_TEST_VERSION ] [ -d ../../$NVM_TEST_VERSION ]
nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION

0
test/slow/nvm install/setup_dir → test/installation/setup_dir

2
test/slow/nvm install/teardown_dir → test/installation/teardown_dir

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
. ../../../nvm.sh . ../../nvm.sh
nvm uninstall v0.10.7 nvm uninstall v0.10.7
if [ -f ".nvmrc" ]; then if [ -f ".nvmrc" ]; then
Loading…
Cancel
Save