diff options
author | Forrest L Norvell <forrest@npmjs.com> | 2016-03-17 03:46:23 +0300 |
---|---|---|
committer | Kat Marchán <kzm@sykosomatic.org> | 2016-03-25 00:20:09 +0300 |
commit | 1d0e468c06c7b8e2b95b7fe874a3399a16d9db74 (patch) | |
tree | 31a04d51632a8287ce218674abe37ec116c38b25 | |
parent | b70fab3c4db2e00b922c75f808f3b497b0c3b12c (diff) |
test: remove disabled tests
And also remove update-test.sh, which hasn't been used for a pretty long
time now.
Steps along the way to hoisting the tap tests up to the root test/.
Credit: @othiym23
PR-URL: https://github.com/npm/npm/pull/11931
Reviewed-By: @iarna
-rw-r--r-- | test/disabled/bundlerecurs/package.json | 4 | ||||
-rw-r--r-- | test/disabled/change-bin-1/bin/foo | 2 | ||||
-rw-r--r-- | test/disabled/change-bin-1/package.json | 3 | ||||
-rw-r--r-- | test/disabled/change-bin-2/bin/bar | 2 | ||||
-rw-r--r-- | test/disabled/change-bin-2/package.json | 3 | ||||
-rw-r--r-- | test/disabled/failer/package.json | 5 | ||||
-rw-r--r-- | test/disabled/fast/package.json | 9 | ||||
-rw-r--r-- | test/disabled/package-bar/package.json | 7 | ||||
-rw-r--r-- | test/disabled/package-config/package.json | 4 | ||||
-rwxr-xr-x | test/disabled/package-config/test.js | 17 | ||||
-rw-r--r-- | test/disabled/package-foo/package.json | 4 | ||||
-rw-r--r-- | test/disabled/slow/package.json | 9 | ||||
-rwxr-xr-x | test/update-test.sh | 59 |
13 files changed, 0 insertions, 128 deletions
diff --git a/test/disabled/bundlerecurs/package.json b/test/disabled/bundlerecurs/package.json deleted file mode 100644 index d87041170..000000000 --- a/test/disabled/bundlerecurs/package.json +++ /dev/null @@ -1,4 +0,0 @@ -{ "name" : "bundletest" -, "version" : "1.0.0" -, "dependencies" : { "bundletest" : "*" } -} diff --git a/test/disabled/change-bin-1/bin/foo b/test/disabled/change-bin-1/bin/foo deleted file mode 100644 index fb16c2b23..000000000 --- a/test/disabled/change-bin-1/bin/foo +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -echo "foo" diff --git a/test/disabled/change-bin-1/package.json b/test/disabled/change-bin-1/package.json deleted file mode 100644 index 0d82f3afa..000000000 --- a/test/disabled/change-bin-1/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{"name":"npm-test-change-bin" -,"version":"1.2.3" -,"directories":{"bin":"./bin"}} diff --git a/test/disabled/change-bin-2/bin/bar b/test/disabled/change-bin-2/bin/bar deleted file mode 100644 index fb16c2b23..000000000 --- a/test/disabled/change-bin-2/bin/bar +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -echo "foo" diff --git a/test/disabled/change-bin-2/package.json b/test/disabled/change-bin-2/package.json deleted file mode 100644 index 3fdc538fa..000000000 --- a/test/disabled/change-bin-2/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{"name":"npm-test-change-bin" -,"version":"2.3.4" -,"directories":{"bin":"./bin"}} diff --git a/test/disabled/failer/package.json b/test/disabled/failer/package.json deleted file mode 100644 index ff596d158..000000000 --- a/test/disabled/failer/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ "name" : "npm-test-failer" -, "version" : "9999.999.99" -, "dependencies" : { "base64" : "*" } -, "scripts" : { "install" : "exit 1", "test": "echo 'This is where the test output would go'; echo 'more test output'; echo 'MOAR MOAR MoAR'; exit 1" } -} diff --git a/test/disabled/fast/package.json b/test/disabled/fast/package.json deleted file mode 100644 index fbf26e9b1..000000000 --- a/test/disabled/fast/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ "name" : "fast" -, "description" : "does nothing, and not very fast" -, "version" : "1.2.3" -, "scripts" : -{ "preinstall" : "sleep 1 && echo fast 1 $(date +%s) && echo fast 2" -, "install" : "sleep 1 && echo fast 2 $(date +%s) && echo fast 3" -, "postinstall" : "sleep 1 && echo fast 3 $(date +%s) && echo fast 4" -} -} diff --git a/test/disabled/package-bar/package.json b/test/disabled/package-bar/package.json deleted file mode 100644 index f9a278010..000000000 --- a/test/disabled/package-bar/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "package-bar", - "version": "0.5.0", - "dependencies": { - "package-foo": "*" - } -} diff --git a/test/disabled/package-config/package.json b/test/disabled/package-config/package.json deleted file mode 100644 index 7ec97d380..000000000 --- a/test/disabled/package-config/package.json +++ /dev/null @@ -1,4 +0,0 @@ -{"name":"package-config" -,"version":"1.2.3" -,"config":{"foo":"bar"} -,"scripts":{"test":"./test.js"}} diff --git a/test/disabled/package-config/test.js b/test/disabled/package-config/test.js deleted file mode 100755 index 7337b237b..000000000 --- a/test/disabled/package-config/test.js +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env node - -var env = process.env - , orig = require(process.env.npm_package_name+"/package.json").config - , assert = require("assert") - -console.log("Before running this test, do:\n" - +" npm config set package-config:foo boo\n" - +"or else it's about to fail.") -assert.equal(env.npm_package_config_foo, "boo", "foo != boo") -assert.equal(orig.foo, "bar", "original foo != bar") -assert.equal(env["npm_config_package-config:foo"], "boo", - "package-config:foo != boo") -console.log({ foo: env.npm_package_config_foo - , orig_foo: orig.foo - , "package-config:foo": env["npm_config_package-config:foo"] - }) diff --git a/test/disabled/package-foo/package.json b/test/disabled/package-foo/package.json deleted file mode 100644 index 31e791f64..000000000 --- a/test/disabled/package-foo/package.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "package-foo", - "version": "0.5.0" -} diff --git a/test/disabled/slow/package.json b/test/disabled/slow/package.json deleted file mode 100644 index ba6be42fa..000000000 --- a/test/disabled/slow/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ "name" : "slow" -, "description" : "just like fast, but even slower" -, "version" : "1.2.3" -, "scripts" : - { "preinstall" : "sleep 1 && echo slow 1 $(date +%s) && sleep 1 && echo slow 2 $(date +%s)" - , "install" : "sleep 1 && echo slow 2 $(date +%s) && sleep 1 && echo slow 3 $(date +%s)" - , "postinstall" : "sleep 1 && echo slow 3 $(date +%s) && sleep 1 && echo slow 4 $(date +%s)" - } -} diff --git a/test/update-test.sh b/test/update-test.sh deleted file mode 100755 index f72c90dd9..000000000 --- a/test/update-test.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash - -SELF_PATH="$0" -if [ "${SELF_PATH:0:1}" != "." ] && [ "${SELF_PATH:0:1}" != "/" ]; then - SELF_PATH=./"$SELF_PATH" -fi -SELF_PATH=$( cd -P -- "$(dirname -- "$SELF_PATH")" \ - && pwd -P \ - ) && SELF_PATH=$SELF_PATH/$(basename -- "$0") - -# resolve symlinks -while [ -h "$SELF_PATH" ]; do - DIR=$(dirname -- "$SELF_PATH") - SYM=$(readlink -- "$SELF_PATH") - SELF_PATH=$( cd -- "$DIR" \ - && cd -- $(dirname -- "$SYM") \ - && pwd \ - )/$(basename -- "$SYM") -done -DIR=$( dirname -- "$SELF_PATH" ) - -export npm_config_root=$DIR/root -export npm_config_binroot=$DIR/bin - -rm -rf $DIR/{root,bin} -mkdir -p $DIR/root -mkdir -p $DIR/bin -npm ls installed 2>/dev/null | grep -v npm | awk '{print $1}' | xargs npm rm &>/dev/null -npm install \ - base64@1.0.0 \ - eyes@0.1.1 \ - vows@0.2.5 \ - websocket-server@1.0.5 &>/dev/null -npm install ./test/packages/blerg &>/dev/null -npm install vows@0.3.0 &>/dev/null - -echo "" -echo "##" -echo "## starting update" -echo "##" -echo "" - -npm update - -echo "" -echo "##" -echo "## update done, all should be 'latest'" -echo "##" -echo "" - -list=$( npm ls installed remote 2>/dev/null ) -echo "$list" -notlatest=$( echo "$list" | grep -v latest ) -if [ "$notlatest" != "" ]; then - echo "Failed: not latest" - echo $notlatest -else - echo "ok" -fi |