Fix new Execa version

ehmicky · Dec 22, 2019 · cac7630 · cac7630
1 parent f160341
commit cac7630
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/processes/error.js b/src/processes/error.js
@@ -2,7 +2,7 @@ import { getTimeoutError } from './timeout.js'
 
 // Forward any child process error
 export const forwardChildError = function({
-  message,
+  shortMessage,
   failed,
   timedOut,
   duration,
@@ -16,7 +16,7 @@ export const forwardChildError = function({
   }
 
   const messageA = getMessage({
-    message,
+    shortMessage,
     timedOut,
     duration,
     taskPath,
@@ -28,7 +28,7 @@ export const forwardChildError = function({
 }
 
 const getMessage = function({
-  message,
+  shortMessage,
   timedOut,
   duration,
   taskPath,
@@ -43,7 +43,7 @@ const getMessage = function({
     return `${taskPrefix}${timeoutError}`
   }
 
-  const execaError = getExecaError(message)
+  const execaError = getExecaError(shortMessage)
   const errorOutputA = normalizeErrorOutput(errorOutput)
   return `${taskPrefix}${execaError}${errorOutputA}`
 }
@@ -61,8 +61,10 @@ const getTaskPrefix = function({ taskPath, taskId, variationId }) {
   return `In '${taskPath}', task '${taskId}' (variation '${variationId}'): `
 }
 
-const getExecaError = function(message) {
-  return message.replace(EXECA_MESSAGE_START, '').replace(EXECA_MESSAGE_END, '')
+const getExecaError = function(shortMessage) {
+  return shortMessage
+    .replace(EXECA_MESSAGE_START, '')
+    .replace(EXECA_MESSAGE_END, '')
 }
 
 const EXECA_MESSAGE_START = 'Command '

diff --git a/src/processes/execute.js b/src/processes/execute.js
@@ -39,7 +39,7 @@ export const executeChild = async function({
   // Wait for child process successful exit, failed exit, spawning error,
   // stream error or timeout
   const [
-    { message, failed, timedOut },
+    { shortMessage, failed, timedOut },
     output,
     errorOutput,
   ] = await Promise.all([
@@ -49,7 +49,7 @@ export const executeChild = async function({
   ])
 
   forwardChildError({
-    message,
+    shortMessage,
     failed,
     timedOut,
     duration,

diff --git a/src/run/description.js b/src/run/description.js
@@ -34,7 +34,9 @@ const getVersion = async function({ name, value, runnerId }) {
     const version = stdout.replace(LEADING_V, '')
     return `${nameA}${version}`
   } catch (error) {
-    throw new Error(`Could not load runner '${runnerId}'\n\n${error.message}`)
+    throw new Error(
+      `Could not load runner '${runnerId}'\n\n${error.shortMessage}`,
+    )
   }
 }