install: Stop removing failing optionals from the tree

Credit: @iarna
Reviewed-By: @zkat
PR-URL: https://github.com/npm/npm/pull/19054
Fixes: https://github.com/npm/npm/issues/10335
Fixes: https://github.com/npm/npm/issues/2679
Fixes: https://github.com/npm/npm/issues/18380

1 files changed, 6 insertions, 12 deletions

diff --git a/test/tap/optional-metadep-rollback-collision.js b/test/tap/optional-metadep-rollback-collision.js
index ce62e005b..f4ac6bdc7 100644
--- a/test/tap/optional-metadep-rollback-collision.js
+++ b/test/tap/optional-metadep-rollback-collision.js
@@ -158,7 +158,7 @@ test('setup', function (t) {
   })
 })
 test('go go test racer', function (t) {
-  common.npm(
+  return common.npm(
     [
       '--prefix', pkg,
       '--fetch-retries', '0',
@@ -175,19 +175,13 @@ test('go go test racer', function (t) {
         PATH: process.env.PATH,
         Path: process.env.Path
       },
-      stdio: [ 0, 'pipe', 2 ]
-    },
-    function (er, code, stdout, stderr) {
-      t.ifError(er, 'install ran to completion without error')
-      t.is(code, 0, 'npm install exited with code 0')
+      stdio: 'pipe'
+    }).spread((code, stdout, stderr) => {
+      t.comment(stdout.trim())
       t.comment(stderr.trim())
-      // stdout should be empty, because we only have one, optional, dep and
-      // if it fails we shouldn't try installing anything
-      t.equal(stdout, '')
+      t.is(code, 0, 'npm install exited with code 0')
       t.notOk(/not ok/.test(stdout), 'should not contain the string \'not ok\'')
-      t.end()
-    }
-  )
+    })
 })
 
 test('verify results', function (t) {