Fix broken tests on main

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+  "javascript.validate.enable": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  },
+  "editor.formatOnSave": true
+}

tests/fixtures/batch-test-group/.bazelrc

@@ -0,0 +1,3 @@
+# Disable Bzlmod
+common --noenable_bzlmod
+common --enable_workspace

tests/fixtures/batch-test-group/.bazelversion

@@ -0,0 +1 @@
+7.1.2

tests/fixtures/bazel-dependent-builds/.bazelrc

@@ -0,0 +1,3 @@
+# Disable Bzlmod
+common --noenable_bzlmod
+common --enable_workspace

tests/fixtures/bazel-dependent-builds/.bazelversion

@@ -0,0 +1 @@
+7.1.2

tests/fixtures/bazel-dependent-failure/.bazelrc

@@ -0,0 +1,3 @@
+# Disable Bzlmod
+common --noenable_bzlmod
+common --enable_workspace

tests/fixtures/bazel-dependent-failure/.bazelversion

@@ -0,0 +1 @@
+7.1.2

tests/fixtures/bazel-rules/.bazelrc

@@ -0,0 +1,3 @@
+# Disable Bzlmod
+common --noenable_bzlmod
+common --enable_workspace

tests/fixtures/bazel-rules/.bazelversion

@@ -0,0 +1 @@
+7.1.2

tests/fixtures/bin/.bazelrc

@@ -0,0 +1,3 @@
+# Disable Bzlmod
+common --noenable_bzlmod
+common --enable_workspace

tests/fixtures/bin/.bazelversion

@@ -0,0 +1 @@
+7.1.2

tests/fixtures/commands/.bazelrc

@@ -0,0 +1,3 @@
+# Disable Bzlmod
+common --noenable_bzlmod
+common --enable_workspace

tests/fixtures/commands/.bazelversion

@@ -0,0 +1 @@
+7.1.2

tests/fixtures/find-changed-targets/bazel/.bazelrc

@@ -0,0 +1,3 @@
+# Disable Bzlmod
+common --noenable_bzlmod
+common --enable_workspace

tests/fixtures/find-changed-targets/bazel/.bazelversion

@@ -0,0 +1 @@
+7.1.2

tests/fixtures/report-mismatched-top-level-deps/.bazelrc

@@ -0,0 +1,3 @@
+# Disable Bzlmod
+common --noenable_bzlmod
+common --enable_workspace

tests/fixtures/report-mismatched-top-level-deps/.bazelversion

@@ -0,0 +1 @@
+7.1.2

tests/fixtures/scaffold/.bazelrc

@@ -0,0 +1,3 @@
+# Disable Bzlmod
+common --noenable_bzlmod
+common --enable_workspace

tests/fixtures/scaffold/.bazelversion

@@ -0,0 +1 @@
+7.1.2

tests/fixtures/script/.bazelrc

@@ -0,0 +1,3 @@
+# Disable Bzlmod
+common --noenable_bzlmod
+common --enable_workspace

tests/fixtures/script/.bazelversion

@@ -0,0 +1 @@
+7.1.2

tests/fixtures/yarn-pnp/.bazelrc

@@ -0,0 +1,3 @@
+# Disable Bzlmod
+common --noenable_bzlmod
+common --enable_workspace

tests/fixtures/yarn-pnp/.bazelversion

@@ -0,0 +1 @@
+7.1.2

tests/index.js

@@ -67,9 +67,10 @@ const {shouldSync, getVersion} = require('../utils/version-onboarding.js');
 const yarnCmds = require('../utils/yarn-commands.js');
 const {sortPackageJson} = require('../utils/sort-package-json');
 
+const originalProcessExit = process.exit;
 process.on('unhandledRejection', e => {
   console.error(e.stack);
-  process.exit(1);
+  originalProcessExit(1);
 });
 
 // $FlowFixMe flow can't handle statics of async function
@@ -80,32 +81,88 @@ const tmp = tmpdir();
 runTests();
 
 async function t(test) {
+  const testName = test.name;
   const match = (process.argv[2] || '').toLowerCase();
-  if (test.name.toLowerCase().indexOf(match) > -1) {
+
+  if (testName.toLowerCase().indexOf(match) > -1) {
     if (match) console.log(`Testing ${test.name}`);
     try {
       await test();
+      console.log(`✅ ${testName}`);
     } catch (e) {
-      console.error(`\n\nTest "${test.name}" failed with error:`);
+      console.log(`❌ ${testName}`);
       throw e;
     }
   }
 }
 
+/**
+ * Uses an error stack trace to determine which test from this
+ * file caused a given function to be called.
+ */
+function getCallingTestFn() {
+  const error = new Error();
+  if (!error.stack) return null;
+
+  const errorStackLines = error.stack.split('\n');
+  for (const line of errorStackLines) {
+    const trimmedLine = line.split('at ')[1];
+    if (!trimmedLine) continue;
+
+    const [, fnName, filePath] =
+      trimmedLine.match(
+        /^(?:async )?(?:(.+) \()?(?:file:\/\/)?([^:]+):(\d+):(\d+)\)?$/
+      ) || [];
+
+    if (
+      filePath === __filename &&
+      fnName.startsWith('test') &&
+      fnName.length > 4
+    ) {
+      return fnName;
+    }
+  }
+
+  return null;
+}
+
+const testsExpectingExit /*: Map<string, number> */ = new Map();
+// $FlowFixMe
+process.exit = (code = 0) => {
+  const callingTest = getCallingTestFn();
+  if (callingTest && testsExpectingExit.has(callingTest)) {
+    testsExpectingExit.set(callingTest, code);
+    return;
+  }
+
+  // $FlowFixMe: bad libdef
+  assert.fail(`'process.exit' was unexpectedly called with code '${code}'`);
+};
+
 async function expectProcessExit(expectedExitCode, run) {
+  const callingTest = getCallingTestFn() || '';
+  const shouldUseFallbackExitMock = !callingTest;
+
   let exitCode = 0;
-  // $FlowFixMe
   const originalExit = process.exit;
-  // $FlowFixMe
-  process.exit = (code = 0) => {
-    exitCode = code;
-  };
+  if (shouldUseFallbackExitMock) {
+    // $FlowFixMe
+    process.exit = (code = 0) => {
+      exitCode = code;
+    };
+  } else {
+    testsExpectingExit.set(callingTest, 0);
+  }
 
   try {
     await run();
   } finally {
-    // $FlowFixMe
-    process.exit = originalExit;
+    if (shouldUseFallbackExitMock) {
+      // $FlowFixMe
+      process.exit = originalExit;
+    } else {
+      exitCode = testsExpectingExit.get(callingTest) || 0;
+    }
 
     assert.strictEqual(
       exitCode,