diff options
| author | Rebecca Turner <me@re-becca.org> | 2016-11-17 03:15:27 +0300 |
|---|---|---|
| committer | Rebecca Turner <me@re-becca.org> | 2016-11-18 01:38:49 +0300 |
| commit | 7e0016d5bea53ec2e926ae933e4df9cea12c377a (patch) | |
| tree | ee723ade130654fae9aa96b5ecd531df86dfa081 | |
| parent | 58fe064dcc80bc08c677647832f2adb4a56b538a (diff) | |
travis: Now that we aren't avoiding slow tests, stop segregating them
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | package.json | 6 | ||||
| -rw-r--r-- | test/tap/legacy-npm-self-install.js (renamed from test/slow/legacy-npm-self-install.js) | 0 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index c987e6a50..4c6548d1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ matrix: # only gather coverage info for LTS env: DEPLOY_VERSION=testing COVERALLS_REPO_TOKEN="$COVERALLS_OPTIONAL_TOKEN" script: - - "node . run tap-cover -- \"test/tap/*.js\" \"test/slow/*.js\"" + - "node . run tap-cover -- \"test/tap/*.js\"" - "unset COVERALLS_REPO_TOKEN ; node . run tap -- \"test/broken-under-*/*.js\"" # previous LTS is next most important - node_js: "4" @@ -50,4 +50,4 @@ install: - "node . install --ignore-scripts" - "make -j4 doc" script: - - "node . run tap -- \"test/tap/*.js\" \"test/slow/*.js\" \"test/broken-under-nyc/*.js\"" + - "node . run tap -- \"test/tap/*.js\" \"test/broken-under-nyc/*.js\"" diff --git a/package.json b/package.json index 266ab8164..7083a008b 100644 --- a/package.json +++ b/package.json @@ -211,9 +211,9 @@ "tap": "tap --timeout 300", "tap-cover": "tap --nyc-arg='--cache' --coverage --timeout 600", "test": "standard && npm run test-tap", - "test-coverage": "npm run tap-cover -- \"test/tap/*.js\" \"test/network/*.js\" \"test/slow/*.js\" \"test/broken-under-*/*.js\"", - "test-tap": "npm run tap -- \"test/tap/*.js\" \"test/network/*.js\" \"test/slow/*.js\" \"test/broken-under-*/*.js\"", - "test-node": "\"$NODE\" \"node_modules/.bin/tap\" --timeout 240 \"test/tap/*.js\" \"test/network/*.js\" \"test/slow/*.js\" \"test/broken-under-nyc*/*.js\"" + "test-coverage": "npm run tap-cover -- \"test/tap/*.js\" \"test/network/*.js\" \"test/broken-under-*/*.js\"", + "test-tap": "npm run tap -- \"test/tap/*.js\" \"test/network/*.js\" \"test/broken-under-*/*.js\"", + "test-node": "\"$NODE\" \"node_modules/.bin/tap\" --timeout 240 \"test/tap/*.js\" \"test/network/*.js\" \"test/broken-under-nyc*/*.js\"" }, "license": "Artistic-2.0" } diff --git a/test/slow/legacy-npm-self-install.js b/test/tap/legacy-npm-self-install.js index 2051802c2..2051802c2 100644 --- a/test/slow/legacy-npm-self-install.js +++ b/test/tap/legacy-npm-self-install.js |