Include underlying error in error message

github · Jun 12, 2024 · 3d849e9 · 3d849e9
1 parent c8fb403
commit 3d849e9
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/lib/init.js b/lib/init.js
diff --git a/lib/init.js.map b/lib/init.js.map
diff --git a/lib/init.test.js b/lib/init.test.js
diff --git a/lib/init.test.js.map b/lib/init.test.js.map
diff --git a/src/init.test.ts b/src/init.test.ts
@@ -108,17 +108,22 @@ for (const { runnerEnv, ErrorConstructor, message } of [
       );
       fs.writeFileSync(fileToCleanUp, "");
 
+      const rmSyncError = `Failed to clean up file ${fileToCleanUp}`;
+
       const messages: LoggedMessage[] = [];
       t.throws(
         () =>
           cleanupDatabaseClusterDirectory(
             createTestConfig({ dbLocation }),
             getRecordingLogger(messages),
             () => {
-              throw new Error("Failed to clean up");
+              throw new Error(rmSyncError);
             },
           ),
-        { instanceOf: ErrorConstructor, message: message(dbLocation) },
+        {
+          instanceOf: ErrorConstructor,
+          message: `${message(dbLocation)} Details: ${rmSyncError}`,
+        },
       );
 
       t.is(messages.length, 1);

diff --git a/src/init.ts b/src/init.ts
@@ -210,13 +210,17 @@ export function cleanupDatabaseClusterDirectory(
       if (isSelfHostedRunner()) {
         throw new util.ConfigurationError(
           `${blurb} This can happen if another process is using the directory or the directory is owned by a different user. ` +
-            "Please clean up the directory manually and rerun the job.",
+            `Please clean up the directory manually and rerun the job. Details: ${
+              util.wrapError(e).message
+            }`,
         );
       } else {
         throw new Error(
           `${blurb} This shouldn't typically happen on hosted runners. ` +
             "If you are using an advanced setup, please check your workflow, otherwise we " +
-            "recommend rerunning the job.",
+            `recommend rerunning the job. Details: ${
+              util.wrapError(e).message
+            }`,
         );
       }
     }