From 8548e522a3e284c88321102572b750a063112afe Mon Sep 17 00:00:00 2001
From: Geoffrey Booth <webadmin@geoffreybooth.com>
Date: Thu, 30 Dec 2021 20:06:37 -0800
Subject: [PATCH] fixup! esm: refactor esm tests out of test/message

---
 test/es-module/test-esm-export-not-found.mjs               | 7 ++++---
 test/es-module/test-esm-import-json-named-export.mjs       | 6 +++---
 test/es-module/test-esm-loader-not-found.mjs               | 6 +++---
 test/es-module/test-esm-loader-obsolete-hooks.mjs          | 2 +-
 test/es-module/test-esm-loader-with-syntax-error.mjs       | 4 ++--
 test/es-module/test-esm-module-not-found-commonjs-hint.mjs | 2 +-
 test/es-module/test-esm-syntax-error.mjs                   | 2 +-
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/test/es-module/test-esm-export-not-found.mjs b/test/es-module/test-esm-export-not-found.mjs
index 1dc44e2bbac97a..6d3644d8716258 100644
--- a/test/es-module/test-esm-export-not-found.mjs
+++ b/test/es-module/test-esm-export-not-found.mjs
@@ -30,9 +30,10 @@ const importStatementMultiline = `import {
   child.on('close', () => {
     // SyntaxError: The requested module './module-named-exports.mjs'
     // does not provide an export named 'notfound'
-    ok(stderr.includes('SyntaxError:'));
+    ok(stderr.includes('SyntaxError:') || console.error(stderr));
     // The quotes ensure that the path starts with ./ and not ../
-    ok(stderr.includes('\'./module-named-exports.mjs\''));
-    ok(stderr.includes('notfound'));
+    ok(stderr.includes('\'./module-named-exports.mjs\'') ||
+      console.error(stderr));
+    ok(stderr.includes('notfound') || console.error(stderr));
   });
 });
diff --git a/test/es-module/test-esm-import-json-named-export.mjs b/test/es-module/test-esm-import-json-named-export.mjs
index 73e8e9184972b4..7db7522f1f4dcf 100644
--- a/test/es-module/test-esm-import-json-named-export.mjs
+++ b/test/es-module/test-esm-import-json-named-export.mjs
@@ -17,7 +17,7 @@ child.stderr.on('data', (data) => {
 child.on('close', () => {
   // SyntaxError: The requested module '../experimental.json'
   // does not provide an export named 'ofLife'
-  ok(stderr.includes('SyntaxError:'));
-  ok(stderr.includes('\'../experimental.json\''));
-  ok(stderr.includes('\'ofLife\''));
+  ok(stderr.includes('SyntaxError:') || console.error(stderr));
+  ok(stderr.includes('\'../experimental.json\'') || console.error(stderr));
+  ok(stderr.includes('\'ofLife\'') || console.error(stderr));
 });
diff --git a/test/es-module/test-esm-loader-not-found.mjs b/test/es-module/test-esm-loader-not-found.mjs
index 545127eb2412aa..c9e55733944f1e 100644
--- a/test/es-module/test-esm-loader-not-found.mjs
+++ b/test/es-module/test-esm-loader-not-found.mjs
@@ -18,8 +18,8 @@ child.stderr.on('data', (data) => {
 child.on('close', () => {
   // Error [ERR_MODULE_NOT_FOUND]: Cannot find package 'i-dont-exist'
   // imported from
-  ok(stderr.includes('ERR_MODULE_NOT_FOUND'));
-  ok(stderr.includes('\'i-dont-exist\''));
+  ok(stderr.includes('ERR_MODULE_NOT_FOUND') || console.error(stderr));
+  ok(stderr.includes('\'i-dont-exist\'') || console.error(stderr));
 
-  ok(!stderr.includes('Bad command or file name'));
+  ok(!stderr.includes('Bad command or file name') || console.error(stderr));
 });
diff --git a/test/es-module/test-esm-loader-obsolete-hooks.mjs b/test/es-module/test-esm-loader-obsolete-hooks.mjs
index a64456bdbe0a97..37c85ce85b24de 100644
--- a/test/es-module/test-esm-loader-obsolete-hooks.mjs
+++ b/test/es-module/test-esm-loader-obsolete-hooks.mjs
@@ -21,5 +21,5 @@ child.on('close', () => {
   ok(stderr.includes(
     'DeprecationWarning: Obsolete loader hook(s) supplied and will be ' +
     'ignored: dynamicInstantiate, getFormat, getSource, transformSource'
-  ));
+  ) || console.error(stderr));
 });
diff --git a/test/es-module/test-esm-loader-with-syntax-error.mjs b/test/es-module/test-esm-loader-with-syntax-error.mjs
index d8ad0b5db27687..6101bcfda4b25e 100644
--- a/test/es-module/test-esm-loader-with-syntax-error.mjs
+++ b/test/es-module/test-esm-loader-with-syntax-error.mjs
@@ -16,6 +16,6 @@ child.stderr.on('data', (data) => {
   stderr += data;
 });
 child.on('close', () => {
-  ok(stderr.includes('SyntaxError:'));
-  ok(!stderr.includes('Bad command or file name'));
+  ok(stderr.includes('SyntaxError:') || console.error(stderr));
+  ok(!stderr.includes('Bad command or file name') || console.error(stderr));
 });
diff --git a/test/es-module/test-esm-module-not-found-commonjs-hint.mjs b/test/es-module/test-esm-module-not-found-commonjs-hint.mjs
index ffe26b6980ffbd..495c085dafe3ed 100644
--- a/test/es-module/test-esm-module-not-found-commonjs-hint.mjs
+++ b/test/es-module/test-esm-module-not-found-commonjs-hint.mjs
@@ -29,6 +29,6 @@ import { execPath } from 'process';
     stderr += data;
   });
   child.on('close', () => {
-    ok(stderr.includes(expected));
+    ok(stderr.includes(expected) || console.error(stderr));
   });
 });
diff --git a/test/es-module/test-esm-syntax-error.mjs b/test/es-module/test-esm-syntax-error.mjs
index a40aba09d845b5..0d688f85ff5e98 100644
--- a/test/es-module/test-esm-syntax-error.mjs
+++ b/test/es-module/test-esm-syntax-error.mjs
@@ -14,5 +14,5 @@ child.stderr.on('data', (data) => {
   stderr += data;
 });
 child.on('close', () => {
-  ok(stderr.includes('SyntaxError:'));
+  ok(stderr.includes('SyntaxError:') || console.error(stderr));
 });