1 files changed, 6 insertions, 29 deletions
diff --git a/deps/npm/test/tap/ls-l-depth-0.js b/deps/npm/test/tap/ls-l-depth-0.js
index b2516c9fa2..8e707a1d39 100644
--- a/deps/npm/test/tap/ls-l-depth-0.js
+++ b/deps/npm/test/tap/ls-l-depth-0.js
@@ -1,13 +1,10 @@
-var cat = require('graceful-fs').writeFileSync
+var writeFileSync = require('graceful-fs').writeFileSync
 var resolve = require('path').resolve
 
 var mkdirp = require('mkdirp')
 var Bluebird = require('bluebird')
 var mr = Bluebird.promisify(require('npm-registry-mock'))
-var rimraf = require('rimraf')
 var test = require('tap').test
-var tmpdir = require('osenv').tmpdir
-
 var common = require('../common-tap.js')
 
 var pkg = common.pkg
@@ -25,8 +22,6 @@ var expected =
   '    file:glock-1.8.7.tgz\n' +
   '\n'
 
-var server
-
 var EXEC_OPTS = { cwd: pkg }
 
 var fixture = {
@@ -44,9 +39,12 @@ var fixture = {
 var deppack
 
 test('setup', function (t) {
-  setup()
+  mkdirp.sync(modules)
+  mkdirp.sync(dep)
+
+  writeFileSync(resolve(dep, 'package.json'), JSON.stringify(fixture))
   return mr({ port: common.port }).then((s) => {
-    server = s
+    t.parent.teardown(() => s.close())
     return common.npm(['pack', dep], EXEC_OPTS)
   }).spread((code, stdout) => {
     t.is(code, 0, 'pack')
@@ -100,24 +98,3 @@ test('#6311: npm ll --depth=0 duplicates listing', function (t) {
     }
   )
 })
-
-test('cleanup', function (t) {
-  cleanup()
-  server.close()
-
-  t.end()
-})
-
-function cleanup () {
-  process.chdir(tmpdir())
-  rimraf.sync(pkg)
-}
-
-function setup () {
-  cleanup()
-
-  mkdirp.sync(modules)
-  mkdirp.sync(dep)
-
-  cat(resolve(dep, 'package.json'), JSON.stringify(fixture))
-}