1 files changed, 24 insertions, 28 deletions
diff --git a/deps/npm/test/tap/startstop.js b/deps/npm/test/tap/startstop.js
index f056aa7892..334551ed29 100644
--- a/deps/npm/test/tap/startstop.js
+++ b/deps/npm/test/tap/startstop.js
@@ -1,22 +1,18 @@
-var common = require('../common-tap')
-  , test = require('tap').test
-  , path = require('path')
-  , spawn = require('child_process').spawn
-  , rimraf = require('rimraf')
-  , mkdirp = require('mkdirp')
-  , pkg = __dirname + '/startstop'
-  , cache = pkg + '/cache'
-  , tmp = pkg + '/tmp'
-  , node = process.execPath
-  , npm = path.resolve(__dirname, '../../cli.js')
+var common = require("../common-tap")
+  , test = require("tap").test
+  , path = require("path")
+  , rimraf = require("rimraf")
+  , mkdirp = require("mkdirp")
+  , pkg = path.resolve(__dirname, "startstop")
+  , cache = path.resolve(pkg, "cache")
+  , tmp = path.resolve(pkg, "tmp")
   , opts = { cwd: pkg }
 
 function testOutput (t, command, er, code, stdout, stderr) {
-  if (er)
-    throw er
+  t.notOk(code, "npm " + command + " exited with code 0")
 
   if (stderr)
-    throw new Error('npm ' + command + ' stderr: ' + stderr.toString())
+    throw new Error("npm " + command + " stderr: " + stderr.toString())
 
   stdout = stdout.trim().split(/\n|\r/)
   stdout = stdout[stdout.length - 1]
@@ -25,40 +21,40 @@ function testOutput (t, command, er, code, stdout, stderr) {
 }
 
 function cleanup () {
-  rimraf.sync(pkg + '/cache')
-  rimraf.sync(pkg + '/tmp')
+  rimraf.sync(cache)
+  rimraf.sync(tmp)
 }
 
-test('setup', function (t) {
+test("setup", function (t) {
   cleanup()
-  mkdirp.sync(pkg + '/cache')
-  mkdirp.sync(pkg + '/tmp')
+  mkdirp.sync(cache)
+  mkdirp.sync(tmp)
   t.end()
 })
 
-test('npm start', function (t) {
-  common.npm(['start'], opts, testOutput.bind(null, t, "start"))
+test("npm start", function (t) {
+  common.npm(["start"], opts, testOutput.bind(null, t, "start"))
 })
 
-test('npm stop', function (t) {
-  common.npm(['stop'], opts, testOutput.bind(null, t, "stop"))
+test("npm stop", function (t) {
+  common.npm(["stop"], opts, testOutput.bind(null, t, "stop"))
 })
 
-test('npm restart', function (t) {
-  common.npm(['restart'], opts, function (er, c, stdout, stderr) {
+test("npm restart", function (t) {
+  common.npm(["restart"], opts, function (er, c, stdout) {
     if (er)
       throw er
 
-    var output = stdout.split('\n').filter(function (val) {
+    var output = stdout.split("\n").filter(function (val) {
       return val.match(/^s/)
     })
 
-    t.same(output.sort(), ['start', 'stop'].sort())
+    t.same(output.sort(), ["start", "stop"].sort())
     t.end()
   })
 })
 
-test('cleanup', function (t) {
+test("cleanup", function (t) {
   cleanup()
   t.end()
 })