fix: move shellout logic into commands

Each command now signals whether or not it is a shellout

2 files changed, 4 insertions, 2 deletions

diff --git a/test/lib/npm.js b/test/lib/npm.js
index 4302437a6..541c1258d 100644
--- a/test/lib/npm.js
+++ b/test/lib/npm.js
@@ -43,7 +43,6 @@ t.test('not yet loaded', async t => {
       set: Function,
     },
     version: String,
-    shelloutCommands: Array,
   })
   t.throws(() => npm.config.set('foo', 'bar'))
   t.throws(() => npm.config.get('foo'))
diff --git a/test/lib/utils/exit-handler.js b/test/lib/utils/exit-handler.js
index 73bbf06fe..23942cca1 100644
--- a/test/lib/utils/exit-handler.js
+++ b/test/lib/utils/exit-handler.js
@@ -32,7 +32,7 @@ t.cleanSnapshot = (path) => cleanDate(cleanCwd(path))
 // nerf itself, thinking global.process is broken or gone.
 mockGlobals(t, {
   process: Object.assign(new EventEmitter(), {
-    ...pick(process, 'execPath', 'stdout', 'stderr', 'cwd', 'env'),
+    ...pick(process, 'execPath', 'stdout', 'stderr', 'cwd', 'env', 'umask'),
     argv: ['/node', ...process.argv.slice(1)],
     version: 'v1.0.0',
     kill: () => {},
@@ -450,7 +450,10 @@ t.test('exits uncleanly when only emitting exit event', async (t) => {
 t.test('do no fancy handling for shellouts', async t => {
   const { exitHandler, npm, logs } = await mockExitHandler(t)
 
+  const exec = await npm.cmd('exec')
+
   npm.command = 'exec'
+  npm.commandInstance = exec
 
   const loudNoises = () =>
     logs.filter(([level]) => ['warn', 'error'].includes(level))