1 files changed, 14 insertions, 12 deletions
diff --git a/deps/npm/test/tap/prune.js b/deps/npm/test/tap/prune.js
index ef69dc88b9..4fe586359e 100644
--- a/deps/npm/test/tap/prune.js
+++ b/deps/npm/test/tap/prune.js
@@ -10,7 +10,7 @@ var test = require('tap').test
 var common = require('../common-tap')
 var server
 
-var pkg = path.resolve(__dirname, 'prune')
+var pkg = path.resolve(__dirname, path.basename(__filename, '.js'))
 var cache = path.resolve(pkg, 'cache')
 
 var json = {
@@ -52,7 +52,7 @@ test('npm install', function (t) {
     '--loglevel', 'silent',
     '--production', 'false'
   ], EXEC_OPTS, function (err, code, stdout, stderr) {
-    t.ifErr(err, 'install finished successfully')
+    if (err) throw err
     t.notOk(code, 'exit ok')
     t.notOk(stderr, 'Should not get data on stderr: ' + stderr)
     t.end()
@@ -64,55 +64,57 @@ test('npm install test-package', function (t) {
     'install', 'test-package',
     '--cache', cache,
     '--registry', common.registry,
+    '--no-save',
     '--loglevel', 'silent',
     '--production', 'false'
   ], EXEC_OPTS, function (err, code, stdout, stderr) {
-    t.ifErr(err, 'install finished successfully')
+    if (err) throw err
     t.notOk(code, 'exit ok')
     t.notOk(stderr, 'Should not get data on stderr: ' + stderr)
     t.end()
   })
 })
 
-test('verify installs', function (t) {
+test('setup: verify installs', function (t) {
   var dirs = fs.readdirSync(pkg + '/node_modules').sort()
   t.same(dirs, [ 'test-package', 'mkdirp', 'underscore' ].sort())
   t.end()
 })
 
-test('npm prune', function (t) {
+test('dev: npm prune', function (t) {
   common.npm([
     'prune',
     '--loglevel', 'silent',
     '--production', 'false'
   ], EXEC_OPTS, function (err, code, stdout, stderr) {
-    t.ifErr(err, 'prune finished successfully')
+    if (err) throw err
     t.notOk(code, 'exit ok')
     t.notOk(stderr, 'Should not get data on stderr: ' + stderr)
     t.end()
   })
 })
 
-test('verify installs', function (t) {
+test('dev: verify installs', function (t) {
   var dirs = fs.readdirSync(pkg + '/node_modules').sort()
   t.same(dirs, [ 'mkdirp', 'underscore' ])
   t.end()
 })
 
-test('npm prune', function (t) {
+test('production: npm prune', function (t) {
   common.npm([
     'prune',
     '--loglevel', 'silent',
+    '--parseable',
     '--production'
-  ], EXEC_OPTS, function (err, code, stderr) {
-    t.ifErr(err, 'prune finished successfully')
+  ], EXEC_OPTS, function (err, code, stdout) {
+    if (err) throw err
     t.notOk(code, 'exit ok')
-    t.equal(stderr, '- mkdirp@0.3.5 node_modules/mkdirp\n')
+    t.equal(stdout.trim(), 'remove\tmkdirp\t0.3.5\tnode_modules/mkdirp')
     t.end()
   })
 })
 
-test('verify installs', function (t) {
+test('pruduction: verify installs', function (t) {
   var dirs = fs.readdirSync(pkg + '/node_modules').sort()
   t.same(dirs, [ 'underscore' ])
   t.end()