module: fixup lint and test regressions

PR-URL: #30802
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: João Reis <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>

Author: guybedford

test/es-module/test-cjs-esm-warn.js

@@ -26,7 +26,7 @@ child.on('close', common.mustCall((code, signal) => {
   assert.strictEqual(code, 1);
   assert.strictEqual(signal, null);
 
-  assert.ok(stderr.indexOf(
+  assert.ok(stderr.replace(/\r/g, '').includes(
     `Error [ERR_REQUIRE_ESM]: Must use import to load ES Module: ${required}` +
     '\nrequire() of ES modules is not supported.\nrequire() of ' +
     `${required} from ${requiring} ` +
@@ -35,10 +35,7 @@ child.on('close', common.mustCall((code, signal) => {
     'files in that package scope as ES modules.\nInstead rename ' +
     `${basename} to end in .cjs, change the requiring code to use ` +
     'import(), or remove "type": "module" from ' +
-    `${pjson}.\n`) !== -1);
-  assert.ok(stderr.indexOf(
-    'Error [ERR_REQUIRE_ESM]: Must use import to load ES Module') !== -1);
-
-  assert.strictEqual(
-    stderr.match(/Must use import to load ES Module/g).length, 1);
+    `${pjson}.\n`));
+  assert.ok(stderr.includes(
+    'Error [ERR_REQUIRE_ESM]: Must use import to load ES Module'));
 }));

test/es-module/test-esm-specifiers-both-flags.mjs

@@ -11,8 +11,6 @@ const flags = '--experimental-modules ' +
               '--es-module-specifier-resolution=node ' +
               '--experimental-specifier-resolution=node';
 
-exec(`${process.execPath} ${flags}`, {
-  timeout: 300
-}, mustCall((error) => {
+exec(`${process.execPath} ${flags}`, mustCall((error) => {
   assert(error.message.includes(expectedError));
 }));