From d75dc49059e5fad675d56004bd0dce86fa1fa539 Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Fri, 17 Nov 2023 17:15:50 +0900
Subject: [PATCH 1/3] fix: fix test config for `retry` and `bail`

---
 packages/vitest/src/node/cli.ts           | 4 ++--
 packages/vitest/src/node/plugins/index.ts | 6 ++++++
 test/core/test/retry-global.test.ts       | 6 ++++++
 test/core/vite.config.ts                  | 2 ++
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 test/core/test/retry-global.test.ts

diff --git a/packages/vitest/src/node/cli.ts b/packages/vitest/src/node/cli.ts
index c6f453e90a01..7328ec981e1b 100644
--- a/packages/vitest/src/node/cli.ts
+++ b/packages/vitest/src/node/cli.ts
@@ -48,8 +48,8 @@ cli
   .option('--inspect', 'Enable Node.js inspector')
   .option('--inspect-brk', 'Enable Node.js inspector with break')
   .option('--test-timeout <time>', 'Default timeout of a test in milliseconds (default: 5000)')
-  .option('--bail <number>', 'Stop test execution when given number of tests have failed', { default: 0 })
-  .option('--retry <times>', 'Retry the test specific number of times if it fails', { default: 0 })
+  .option('--bail <number>', 'Stop test execution when given number of tests have failed (default: 0)')
+  .option('--retry <times>', 'Retry the test specific number of times if it fails (default: 0)')
   .option('--diff <path>', 'Path to a diff config that will be used to generate diff interface')
   .option('--expand-snapshot-diff', 'Show full diff when snapshot fails')
   .option('--typecheck [options]', 'Custom options for typecheck pool')
diff --git a/packages/vitest/src/node/plugins/index.ts b/packages/vitest/src/node/plugins/index.ts
index 6ffeabc06572..3bb910a04a0b 100644
--- a/packages/vitest/src/node/plugins/index.ts
+++ b/packages/vitest/src/node/plugins/index.ts
@@ -123,12 +123,18 @@ export async function VitestPlugin(options: UserConfig = {}, ctx = new Vitest('t
           delete viteConfigTest.alias
 
         // viteConfig.test is final now, merge it for real
+
+        function debug(obj: object) {
+          return Object.fromEntries(Object.entries(obj).filter(([k, _v]) => ['retry', 'bail', 'segfaultRetry'].includes(k)))
+        }
+        console.log('== configResolved (before)', [debug(options), debug(viteConfigTest)])
         options = deepMerge(
           {},
           configDefaults,
           viteConfigTest,
           options,
         )
+        console.log('== configResolved (after)', [debug(options)])
         options.api = resolveApiServerConfig(options)
 
         // we replace every "import.meta.env" with "process.env"
diff --git a/test/core/test/retry-global.test.ts b/test/core/test/retry-global.test.ts
new file mode 100644
index 000000000000..af27cf164f28
--- /dev/null
+++ b/test/core/test/retry-global.test.ts
@@ -0,0 +1,6 @@
+import { expect, test } from 'vitest'
+
+let number = 0
+test('should passed', () => {
+  expect(number++).toBe(2)
+})
diff --git a/test/core/vite.config.ts b/test/core/vite.config.ts
index f4e13ad7ad24..741f77c61fbc 100644
--- a/test/core/vite.config.ts
+++ b/test/core/vite.config.ts
@@ -44,6 +44,8 @@ export default defineConfig({
     port: 3022,
   },
   test: {
+    retry: 3,
+    bail: 4,
     name: 'core',
     exclude: ['**/fixtures/**', '**/vm-wasm.test.ts', ...defaultExclude],
     slowTestThreshold: 1000,

From fe31447dd24ecd724c5034721e9ad9c70e17632a Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Sat, 18 Nov 2023 15:16:28 +0900
Subject: [PATCH 2/3] chore: revert debug

---
 packages/vitest/src/node/plugins/index.ts | 6 ------
 test/core/test/retry-global.test.ts       | 6 ------
 test/core/vite.config.ts                  | 2 --
 3 files changed, 14 deletions(-)
 delete mode 100644 test/core/test/retry-global.test.ts

diff --git a/packages/vitest/src/node/plugins/index.ts b/packages/vitest/src/node/plugins/index.ts
index 3bb910a04a0b..6ffeabc06572 100644
--- a/packages/vitest/src/node/plugins/index.ts
+++ b/packages/vitest/src/node/plugins/index.ts
@@ -123,18 +123,12 @@ export async function VitestPlugin(options: UserConfig = {}, ctx = new Vitest('t
           delete viteConfigTest.alias
 
         // viteConfig.test is final now, merge it for real
-
-        function debug(obj: object) {
-          return Object.fromEntries(Object.entries(obj).filter(([k, _v]) => ['retry', 'bail', 'segfaultRetry'].includes(k)))
-        }
-        console.log('== configResolved (before)', [debug(options), debug(viteConfigTest)])
         options = deepMerge(
           {},
           configDefaults,
           viteConfigTest,
           options,
         )
-        console.log('== configResolved (after)', [debug(options)])
         options.api = resolveApiServerConfig(options)
 
         // we replace every "import.meta.env" with "process.env"
diff --git a/test/core/test/retry-global.test.ts b/test/core/test/retry-global.test.ts
deleted file mode 100644
index af27cf164f28..000000000000
--- a/test/core/test/retry-global.test.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { expect, test } from 'vitest'
-
-let number = 0
-test('should passed', () => {
-  expect(number++).toBe(2)
-})
diff --git a/test/core/vite.config.ts b/test/core/vite.config.ts
index 741f77c61fbc..f4e13ad7ad24 100644
--- a/test/core/vite.config.ts
+++ b/test/core/vite.config.ts
@@ -44,8 +44,6 @@ export default defineConfig({
     port: 3022,
   },
   test: {
-    retry: 3,
-    bail: 4,
     name: 'core',
     exclude: ['**/fixtures/**', '**/vm-wasm.test.ts', ...defaultExclude],
     slowTestThreshold: 1000,

From 654d825131f350dec69c6977b0b739330204a5b8 Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Sat, 18 Nov 2023 16:07:14 +0900
Subject: [PATCH 3/3] test: test cli invocation

---
 test/config/fixtures/retry/vitest.config.ts |  1 -
 test/config/test/retry.test.ts              | 11 +++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/test/config/fixtures/retry/vitest.config.ts b/test/config/fixtures/retry/vitest.config.ts
index 117d98336427..5a17dbbf8f7e 100644
--- a/test/config/fixtures/retry/vitest.config.ts
+++ b/test/config/fixtures/retry/vitest.config.ts
@@ -2,7 +2,6 @@ import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
   test: {
-    include: ['*.test.ts'],
     retry: 3,
   },
 })
diff --git a/test/config/test/retry.test.ts b/test/config/test/retry.test.ts
index 56ca5e6ece0e..592877456356 100644
--- a/test/config/test/retry.test.ts
+++ b/test/config/test/retry.test.ts
@@ -1,13 +1,8 @@
-import path from 'node:path'
 import { describe, expect, test } from 'vitest'
-import { runVitest } from '../../test-utils'
+import { runVitestCli } from '../../test-utils'
 
-const root = path.resolve('./fixtures/retry')
-function run(testNamePattern?: string) {
-  return runVitest({
-    root,
-    testNamePattern,
-  })
+function run(testNamePattern: string) {
+  return runVitestCli('run', 'fixtures/retry/retry.test.ts', '-c', 'fixtures/retry/vitest.config.ts', '-t', testNamePattern)
 }
 
 describe('retry', () => {