diff options
author | Rebecca Turner <me@re-becca.org> | 2017-04-12 21:47:49 -0700 |
---|---|---|
committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2017-04-25 10:52:01 -0400 |
commit | 00842604483e4c2e622dfdb3a97440e07646158f (patch) | |
tree | f3346902636a44b6037652523767636bf7e4f2c9 /deps/npm/test/tap/git-races.js | |
parent | 061c5da010e0d249379618382a499840d38247b8 (diff) | |
download | android-node-v8-00842604483e4c2e622dfdb3a97440e07646158f.tar.gz android-node-v8-00842604483e4c2e622dfdb3a97440e07646158f.tar.bz2 android-node-v8-00842604483e4c2e622dfdb3a97440e07646158f.zip |
deps: upgrade npm to 4.5.0
PR-URL: https://github.com/nodejs/node/pull/12480
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/test/tap/git-races.js')
-rw-r--r-- | deps/npm/test/tap/git-races.js | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/deps/npm/test/tap/git-races.js b/deps/npm/test/tap/git-races.js index f275455cd0..c6c27d5040 100644 --- a/deps/npm/test/tap/git-races.js +++ b/deps/npm/test/tap/git-races.js @@ -162,7 +162,8 @@ function setup (cb) { var oneTree = [ 'npm-git-test@1.0.0', [ ['dummy-npm-bar@4.0.0', [ - ['dummy-npm-foo@3.0.0', []] + ['dummy-npm-foo@3.0.0', []], + ['dummy-npm-buzz@3.0.0', []] ]], ['dummy-npm-buzz@3.0.0', []], ['dummy-npm-foo@4.0.0', [ @@ -199,17 +200,19 @@ test('setup', function (t) { }) test('correct versions are installed for git dependency', function (t) { - t.plan(3) t.comment('test for https://github.com/npm/npm/issues/7202') npm.commands.install([], function (er) { t.ifError(er, 'installed OK') npm.commands.ls([], true, function (er, result) { t.ifError(er, 'ls OK') var simplified = toSimple(result) - t.ok( - deepEqual(simplified, oneTree) || deepEqual(simplified, otherTree), - 'install tree is correct' - ) + if (deepEqual(simplified, oneTree) || deepEqual(simplified, otherTree)) { + t.pass('install tree is correct') + } else { + t.isDeeply(simplified, oneTree, 'oneTree matches') + t.isDeeply(simplified, otherTree, 'otherTree matches') + } + t.done() }) }) }) |