1 files changed, 18 insertions, 13 deletions
diff --git a/deps/npm/test/tap/ls-l-depth-0.js b/deps/npm/test/tap/ls-l-depth-0.js
index 3958520943..e9c2374aad 100644
--- a/deps/npm/test/tap/ls-l-depth-0.js
+++ b/deps/npm/test/tap/ls-l-depth-0.js
@@ -2,7 +2,8 @@ var cat = require('graceful-fs').writeFileSync
 var resolve = require('path').resolve
 
 var mkdirp = require('mkdirp')
-var mr = require('npm-registry-mock')
+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
@@ -21,6 +22,7 @@ var expected =
   '    an inexplicably hostile sample package\n' +
   '    git+https://github.com/npm/glo.ck.git\n' +
   '    https://glo.ck\n' +
+  '    file:glock-1.8.7.tgz\n' +
   '\n'
 
 var server
@@ -39,12 +41,16 @@ var fixture = {
   }
 }
 
+var deppack
+
 test('setup', function (t) {
   setup()
-  mr({ port: common.port }, function (er, s) {
+  return mr({ port: common.port }).then((s) => {
     server = s
-
-    t.end()
+    return common.npm(['pack', dep], EXEC_OPTS)
+  }).spread((code, stdout) => {
+    t.is(code, 0, 'pack')
+    deppack = stdout.trim()
   })
 })
 
@@ -53,19 +59,18 @@ test('#6311: npm ll --depth=0 duplicates listing', function (t) {
     [
       '--loglevel', 'silent',
       '--registry', common.registry,
-      '--unicode=true',
-      'install', dep
+      '--parseable',
+      'install', deppack
     ],
     EXEC_OPTS,
     function (err, code, stdout, stderr) {
-      t.ifError(err, 'npm install ran without error')
+      if (err) throw err
       t.notOk(code, 'npm install exited cleanly')
-      t.notOk(stderr, 'npm install ran silently')
+      t.is(stderr, '', 'npm install ran silently')
       t.equal(
         stdout.trim(),
-        resolve(__dirname, 'ls-l-depth-0') +
-          '\n└─┬ glock@1.8.7 ' +
-          '\n  └── underscore@1.5.1',
+        'add\tunderscore\t1.5.1\tnode_modules/underscore\t\t\n' +
+        'add\tglock\t1.8.7\tnode_modules/glock',
         'got expected install output'
       )
 
@@ -78,9 +83,9 @@ test('#6311: npm ll --depth=0 duplicates listing', function (t) {
         ],
         EXEC_OPTS,
         function (err, code, stdout, stderr) {
-          t.ifError(err, 'npm ll ran without error')
+          if (err) throw err
           t.is(code, 0, 'npm ll exited cleanly')
-          t.notOk(stderr, 'npm ll ran silently')
+          t.is(stderr, '', 'npm ll ran silently')
           t.equal(
             stdout,
             expected,