deps: upgrade npm to 6.10.2

PR-URL: https://github.com/nodejs/node/pull/28853
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>

1 files changed, 2 insertions, 20 deletions

diff --git a/deps/npm/test/tap/version-git-not-clean.js b/deps/npm/test/tap/version-git-not-clean.js
index b387c00e64..486e2e0766 100644
--- a/deps/npm/test/tap/version-git-not-clean.js
+++ b/deps/npm/test/tap/version-git-not-clean.js
@@ -1,19 +1,15 @@
 var common = require('../common-tap.js')
 var test = require('tap').test
 var npm = require('../../')
-var osenv = require('osenv')
-var path = require('path')
 var fs = require('fs')
-var rimraf = require('rimraf')
-var mkdirp = require('mkdirp')
 var which = require('which')
 var spawn = require('child_process').spawn
 
 var pkg = common.pkg
-var cache = path.resolve(pkg, 'cache')
+var cache = common.cache
 
 test('npm version <semver> with working directory not clean', function (t) {
-  setup()
+  process.chdir(pkg)
   npm.load({ cache: cache, registry: common.registry, prefix: pkg }, function () {
     which('git', function (err, git) {
       t.ifError(err, 'git found')
@@ -81,17 +77,3 @@ test('npm version <semver> --force with working directory not clean', function (
       t.end()
     })
 })
-
-test('cleanup', function (t) {
-  // windows fix for locked files
-  process.chdir(osenv.tmpdir())
-
-  rimraf.sync(pkg)
-  t.end()
-})
-
-function setup () {
-  mkdirp.sync(pkg)
-  mkdirp.sync(cache)
-  process.chdir(pkg)
-}