From 536d7032b629263aeb66a005433aba02d8f357c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= <jlhwung@gmail.com>
Date: Tue, 22 Oct 2024 09:30:31 -0400
Subject: [PATCH] remove test options flaky (#16914)

---
 .github/workflows/ci.yml                                   | 7 -------
 CONTRIBUTING.md                                            | 3 ---
 .../src/index.ts                                           | 6 ------
 3 files changed, 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cadeaf310caf..f01d5fb50197 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,8 +76,6 @@ jobs:
         run: |
           make -j test-ci-coverage
           yarn test:esm
-        env:
-          BABEL_CLI_FLAKY_TESTS: true
       - name: Upload coverage report
         uses: codecov/codecov-action@v3
 
@@ -103,7 +101,6 @@ jobs:
         env:
           BABEL_ENV: test
           USE_ESM: true
-          BABEL_CLI_FLAKY_TESTS: trues
 
   build:
     name: Build Babel Artifacts
@@ -262,7 +259,6 @@ jobs:
         run: |
           BABEL_ENV=test node --max-old-space-size=4096 ./node_modules/.bin/jest --ci
         env:
-          BABEL_CLI_FLAKY_TESTS: true
           TEST_FUZZ: "${{ (matrix.node-version == '6' || matrix.node-version == '8' || matrix.node-version == '10') && 'false' || 'true' }}"
       - name: Use Node.js latest # For `yarn version` in post actions of the first actions/setup-node
         if: matrix.node-version == '6' || matrix.node-version == '8' || matrix.node-version == '10'
@@ -339,13 +335,11 @@ jobs:
         env:
           BABEL_ENV: test
           BABEL_8_BREAKING: true
-          BABEL_CLI_FLAKY_TESTS: true
       - name: Test ESM
         run: yarn test:esm
         env:
           BABEL_ENV: test
           BABEL_8_BREAKING: true
-          BABEL_CLI_FLAKY_TESTS: true
 
   test-windows-mac:
     name: Test on
@@ -375,7 +369,6 @@ jobs:
         run: yarn jest --ci
         env:
           BABEL_ENV: test
-          BABEL_CLI_FLAKY_TESTS: true
 
   external-parser-tests:
     name: Third-party Parser Tests
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7fbf35414374..05e47bfcf15f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -244,9 +244,6 @@ In case you're not able to reproduce an error on CI locally, it may be due to
 
 - Node Version: Travis CI runs the tests against all major node versions. If your tests use JavaScript features unsupported by lower versions of node, then use [minNodeVersion option](#writing-tests) in options.json.
 - Timeout: Check the CI log and if the only errors are timeout errors and you are sure that it's not related to the changes you made, ask someone in the slack channel to trigger rebuild on the CI build and it might be resolved
-- Some `@babel/cli` tests are known to be flaky and thus we do not run them by
-  default locally. You can run them by setting the `BABEL_CLI_FLAKY_TESTS=true`
-  env variable.
 
 In case you're locally getting errors which are not on the CI, it may be due to
 
diff --git a/packages/babel-helper-transform-fixture-test-runner/src/index.ts b/packages/babel-helper-transform-fixture-test-runner/src/index.ts
index 7c0b3c1c71da..88add0b9cb79 100644
--- a/packages/babel-helper-transform-fixture-test-runner/src/index.ts
+++ b/packages/babel-helper-transform-fixture-test-runner/src/index.ts
@@ -635,7 +635,6 @@ export type ProcessTestOpts = {
   inFiles?: Record<string, string>;
   noBabelrc?: boolean;
   minNodeVersion?: number;
-  flaky?: boolean;
   env?: Record<string, string>;
   BABEL_8_BREAKING?: boolean;
 };
@@ -881,15 +880,10 @@ export function buildProcessTests(
       const skip =
         (opts.minNodeVersion &&
           parseInt(process.versions.node, 10) < opts.minNodeVersion) ||
-        (opts.flaky && !process.env.BABEL_CLI_FLAKY_TESTS) ||
         (process.env.BABEL_8_BREAKING
           ? opts.BABEL_8_BREAKING === false
           : opts.BABEL_8_BREAKING === true);
 
-      if (opts.flaky) {
-        testName += " (flaky)";
-      }
-
       const test: ProcessTest = {
         suiteName,
         testName,