squash! update test-stdout-close-catch

lib/internal/errors.js

@@ -426,7 +426,23 @@ function message(key, args) {
  * @returns {Error}
  */
 function uvException(ctx) {
-  const err = new Error();
+  const [ code, uvmsg ] = errmap.get(ctx.errno);
+  let message = `${code}: ${uvmsg}, ${ctx.syscall}`;
+
+  let path;
+  let dest;
+  if (ctx.path) {
+    path = ctx.path.toString();
+    message += ` '${path}'`;
+  }
+  if (ctx.dest) {
+    dest = ctx.dest.toString();
+    message += ` -> '${dest}'`;
+  }
+
+  // Pass the message to the constructor instead of setting it on the object
+  // to make sure it is the same as the one created in C++
+  const err = new Error(message);
 
   for (const prop of Object.keys(ctx)) {
     if (prop === 'message' || prop === 'path' || prop === 'dest') {
@@ -435,20 +451,13 @@ function uvException(ctx) {
     err[prop] = ctx[prop];
   }
 
-  const [ code, uvmsg ] = errmap.get(ctx.errno);
   err.code = code;
-  let message = `${code}: ${uvmsg}, ${ctx.syscall}`;
-  if (ctx.path) {
-    const path = ctx.path.toString();
-    message += ` '${path}'`;
+  if (path) {
     err.path = path;
   }
-  if (ctx.dest) {
-    const dest = ctx.dest.toString();
-    message += ` -> '${dest}'`;
+  if (dest) {
     err.dest = dest;
   }
-  err.message = message;
 
   Error.captureStackTrace(err, uvException);
   return err;