From 6e998ec50fed8e131f2760913510c8aa3ea1ee6e Mon Sep 17 00:00:00 2001
From: imentu <imentu@foxmail.com>
Date: Sat, 17 Jun 2023 11:30:41 +0800
Subject: [PATCH 1/9] chore: add retry option to VitestRunnerConfig

---
 packages/runner/src/types/runner.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/runner/src/types/runner.ts b/packages/runner/src/types/runner.ts
index 6183bb6065fa..eb1ee9edb24e 100644
--- a/packages/runner/src/types/runner.ts
+++ b/packages/runner/src/types/runner.ts
@@ -20,6 +20,7 @@ export interface VitestRunnerConfig {
   maxConcurrency: number
   testTimeout: number
   hookTimeout: number
+  retry: number
 }
 
 export type VitestRunnerImportSource = 'collect' | 'setup'

From 9a67c1ad1ad40b67a5b632672e988d4d603dad91 Mon Sep 17 00:00:00 2001
From: imentu <imentu@foxmail.com>
Date: Sat, 17 Jun 2023 11:33:22 +0800
Subject: [PATCH 2/9] chore: apply retry config when creating test

---
 packages/runner/src/suite.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/runner/src/suite.ts b/packages/runner/src/suite.ts
index 787db602930b..615d0d83ea3f 100644
--- a/packages/runner/src/suite.ts
+++ b/packages/runner/src/suite.ts
@@ -78,7 +78,7 @@ function createSuiteCollector(name: string, factory: SuiteFactory = () => { }, m
       mode,
       suite: undefined!,
       fails: this.fails,
-      retry: options?.retry,
+      retry: options?.retry ?? runner.config.retry,
       repeats: options?.repeats,
       meta: Object.create(null),
     } as Omit<Test, 'context'> as Test

From 1393eed9ccce69fa33fae2c6006997157ccd5f05 Mon Sep 17 00:00:00 2001
From: imentu <imentu@foxmail.com>
Date: Sat, 17 Jun 2023 11:34:14 +0800
Subject: [PATCH 3/9] feat: global configuration for retry setting

---
 docs/config/index.md                | 9 +++++++++
 packages/vitest/src/defaults.ts     | 1 +
 packages/vitest/src/node/cli.ts     | 1 +
 packages/vitest/src/types/config.ts | 7 +++++++
 4 files changed, 18 insertions(+)

diff --git a/docs/config/index.md b/docs/config/index.md
index fc30c1895b95..4f0cfc12ee0f 100644
--- a/docs/config/index.md
+++ b/docs/config/index.md
@@ -1452,3 +1452,12 @@ This config option affects truncating values in `test.each` titles and inside th
 Stop test execution when given number of tests have failed.
 
 By default Vitest will run all of your test cases even if some of them fail. This may not be desired for CI builds where you are only interested in 100% successful builds and would like to stop test execution as early as possible when test failures occur. The `bail` option can be used to speed up CI runs by preventing it from running more tests when failures have occured.
+
+### retry
+
+- **Type:** `number`
+- **Default:** `1`
+- **CLI:** `--retry=<value>`
+- **Version:** Since Vitest 0.33.0
+
+Retry the test specific number of times if it fails.
diff --git a/packages/vitest/src/defaults.ts b/packages/vitest/src/defaults.ts
index b75f658eb304..50c646365434 100644
--- a/packages/vitest/src/defaults.ts
+++ b/packages/vitest/src/defaults.ts
@@ -94,6 +94,7 @@ const config = {
     exclude: defaultExclude,
   },
   slowTestThreshold: 300,
+  retry: 1,
 }
 
 export const configDefaults: Required<Pick<UserConfig, keyof typeof config>> = Object.freeze(config)
diff --git a/packages/vitest/src/node/cli.ts b/packages/vitest/src/node/cli.ts
index fe18091b547e..c68d17f4c362 100644
--- a/packages/vitest/src/node/cli.ts
+++ b/packages/vitest/src/node/cli.ts
@@ -48,6 +48,7 @@ cli
   .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 <number>', 'Retry the test specific number of times if it fails.', { default: 1 })
   .help()
 
 cli
diff --git a/packages/vitest/src/types/config.ts b/packages/vitest/src/types/config.ts
index 040b2d6ccbd9..60413c9e8ae4 100644
--- a/packages/vitest/src/types/config.ts
+++ b/packages/vitest/src/types/config.ts
@@ -597,6 +597,13 @@ export interface InlineConfig {
    * Stop test execution when given number of tests have failed.
    */
   bail?: number
+
+  /**
+   * Retry the test specific number of times if it fails.
+   *
+   * @default 1
+  */
+  retry?: number
 }
 
 export interface TypecheckConfig {

From 24ef653d9271e248a9a788dc63324af9a60b4039 Mon Sep 17 00:00:00 2001
From: imentu <imentu@foxmail.com>
Date: Sun, 18 Jun 2023 09:56:56 +0800
Subject: [PATCH 4/9] test: add tests for global retry option

---
 test/core/test/retry.test.ts | 14 ++++++++++++++
 test/core/vitest.config.ts   |  1 +
 2 files changed, 15 insertions(+)

diff --git a/test/core/test/retry.test.ts b/test/core/test/retry.test.ts
index a60926b5e210..38d3762ed812 100644
--- a/test/core/test/retry.test.ts
+++ b/test/core/test/retry.test.ts
@@ -64,3 +64,17 @@ describe.each([
     expect(flag3).toBe(false)
   })
 }, { retry: 2 })
+
+describe('global retry', () => {
+  let count6 = 0
+  let count7 = 0
+  it('test should inherit options from the global config if missing', () => {
+    count6 += 1
+    expect(count6).toBe(3)
+  })
+
+  it('test should not inherit options from the global config if exists', () => {
+    count7 += 1
+    expect(count7).toBe(5)
+  }, { retry: 5 })
+})
diff --git a/test/core/vitest.config.ts b/test/core/vitest.config.ts
index d2252dd7b2dc..4f35dbcbbb15 100644
--- a/test/core/vitest.config.ts
+++ b/test/core/vitest.config.ts
@@ -46,6 +46,7 @@ export default defineConfig({
     exclude: ['**/fixtures/**', ...defaultExclude],
     slowTestThreshold: 1000,
     testTimeout: 2000,
+    retry: 3,
     setupFiles: [
       './test/setup.ts',
     ],

From 764617213efea178a5acb5411745e04018ef83a6 Mon Sep 17 00:00:00 2001
From: imentu <imentu@foxmail.com>
Date: Mon, 19 Jun 2023 18:34:11 +0800
Subject: [PATCH 5/9] fix: release global retry config in 0.32.2

---
 docs/config/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/config/index.md b/docs/config/index.md
index 4f0cfc12ee0f..cbf7405c7473 100644
--- a/docs/config/index.md
+++ b/docs/config/index.md
@@ -1458,6 +1458,6 @@ By default Vitest will run all of your test cases even if some of them fail. Thi
 - **Type:** `number`
 - **Default:** `1`
 - **CLI:** `--retry=<value>`
-- **Version:** Since Vitest 0.33.0
+- **Version:** Since Vitest 0.32.2
 
 Retry the test specific number of times if it fails.

From 9c0c349729ec24d7a0fd99e4b9d7274dc5094561 Mon Sep 17 00:00:00 2001
From: imentu <imentu@foxmail.com>
Date: Mon, 19 Jun 2023 18:37:55 +0800
Subject: [PATCH 6/9] fix: mention retry in CLI documentation

---
 docs/guide/cli.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/guide/cli.md b/docs/guide/cli.md
index b13e93804c91..128e867ace7e 100644
--- a/docs/guide/cli.md
+++ b/docs/guide/cli.md
@@ -93,6 +93,7 @@ Run only [benchmark](https://vitest.dev/guide/features.html#benchmarking-experim
 | `--inspect` | Enables Node.js inspector |
 | `--inspect-brk` | Enables Node.js inspector with break |
 | `--bail <number>` | Stop test execution when given number of tests have failed |
+| `--retry <number>` | Retry the test specific number of times if it fails |
 | `-h, --help` | Display available CLI options |
 
 ::: tip

From 0349e8c94c6d994ded2cf2afef374e24d979cdf5 Mon Sep 17 00:00:00 2001
From: imentu <imentu@foxmail.com>
Date: Mon, 19 Jun 2023 18:52:02 +0800
Subject: [PATCH 7/9] fix: should release it in 0.32.3

---
 docs/config/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/config/index.md b/docs/config/index.md
index cbf7405c7473..32fa3b8284e0 100644
--- a/docs/config/index.md
+++ b/docs/config/index.md
@@ -1458,6 +1458,6 @@ By default Vitest will run all of your test cases even if some of them fail. Thi
 - **Type:** `number`
 - **Default:** `1`
 - **CLI:** `--retry=<value>`
-- **Version:** Since Vitest 0.32.2
+- **Version:** Since Vitest 0.32.3
 
 Retry the test specific number of times if it fails.

From c61863c3206610cb355254a229c21676e3dee4b1 Mon Sep 17 00:00:00 2001
From: imentu <imentu@foxmail.com>
Date: Mon, 19 Jun 2023 18:58:10 +0800
Subject: [PATCH 8/9] test: using a separate fixture to test retry

---
 test/config/fixtures/retry/retry.test.ts    | 10 ++++++++
 test/config/fixtures/retry/vitest.config.ts |  8 +++++++
 test/config/test/retry.test.ts              | 26 +++++++++++++++++++++
 test/core/test/retry.test.ts                | 14 -----------
 test/core/vitest.config.ts                  |  1 -
 5 files changed, 44 insertions(+), 15 deletions(-)
 create mode 100644 test/config/fixtures/retry/retry.test.ts
 create mode 100644 test/config/fixtures/retry/vitest.config.ts
 create mode 100644 test/config/test/retry.test.ts

diff --git a/test/config/fixtures/retry/retry.test.ts b/test/config/fixtures/retry/retry.test.ts
new file mode 100644
index 000000000000..60cdefeecaf7
--- /dev/null
+++ b/test/config/fixtures/retry/retry.test.ts
@@ -0,0 +1,10 @@
+import { expect, test } from 'vitest'
+
+let number = 0
+test('should passed', () => {
+  expect(number++).toBe(3)
+})
+
+test('retry but still failed', () => {
+  expect(number++).toBe(4)
+})
diff --git a/test/config/fixtures/retry/vitest.config.ts b/test/config/fixtures/retry/vitest.config.ts
new file mode 100644
index 000000000000..35ad214c9cab
--- /dev/null
+++ b/test/config/fixtures/retry/vitest.config.ts
@@ -0,0 +1,8 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    include: ['*.test.ts'],
+    retry: 4,
+  },
+})
diff --git a/test/config/test/retry.test.ts b/test/config/test/retry.test.ts
new file mode 100644
index 000000000000..56ca5e6ece0e
--- /dev/null
+++ b/test/config/test/retry.test.ts
@@ -0,0 +1,26 @@
+import path from 'node:path'
+import { describe, expect, test } from 'vitest'
+import { runVitest } from '../../test-utils'
+
+const root = path.resolve('./fixtures/retry')
+function run(testNamePattern?: string) {
+  return runVitest({
+    root,
+    testNamePattern,
+  })
+}
+
+describe('retry', () => {
+  test('should passed', async () => {
+    const { stdout } = await run('should passed')
+    expect(stdout).toContain('1 passed')
+  })
+
+  test('retry but still failed', async () => {
+    const { stdout } = await run('retry but still failed')
+    expect(stdout).toContain('expected 1 to be 4')
+    expect(stdout).toContain('expected 2 to be 4')
+    expect(stdout).toContain('expected 3 to be 4')
+    expect(stdout).toContain('1 failed')
+  })
+})
diff --git a/test/core/test/retry.test.ts b/test/core/test/retry.test.ts
index 38d3762ed812..a60926b5e210 100644
--- a/test/core/test/retry.test.ts
+++ b/test/core/test/retry.test.ts
@@ -64,17 +64,3 @@ describe.each([
     expect(flag3).toBe(false)
   })
 }, { retry: 2 })
-
-describe('global retry', () => {
-  let count6 = 0
-  let count7 = 0
-  it('test should inherit options from the global config if missing', () => {
-    count6 += 1
-    expect(count6).toBe(3)
-  })
-
-  it('test should not inherit options from the global config if exists', () => {
-    count7 += 1
-    expect(count7).toBe(5)
-  }, { retry: 5 })
-})
diff --git a/test/core/vitest.config.ts b/test/core/vitest.config.ts
index 4f35dbcbbb15..d2252dd7b2dc 100644
--- a/test/core/vitest.config.ts
+++ b/test/core/vitest.config.ts
@@ -46,7 +46,6 @@ export default defineConfig({
     exclude: ['**/fixtures/**', ...defaultExclude],
     slowTestThreshold: 1000,
     testTimeout: 2000,
-    retry: 3,
     setupFiles: [
       './test/setup.ts',
     ],

From 584532f0201da5d6d616d0463a8e1609a2106cbb Mon Sep 17 00:00:00 2001
From: imentu <imentu@foxmail.com>
Date: Sat, 24 Jun 2023 19:52:59 +0800
Subject: [PATCH 9/9] fix: default retry number should be 0

---
 docs/config/index.md                        | 2 +-
 docs/guide/cli.md                           | 2 +-
 packages/vitest/src/defaults.ts             | 1 -
 packages/vitest/src/node/cli.ts             | 2 +-
 packages/vitest/src/types/config.ts         | 2 +-
 test/config/fixtures/retry/vitest.config.ts | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/config/index.md b/docs/config/index.md
index 32fa3b8284e0..e80739854b95 100644
--- a/docs/config/index.md
+++ b/docs/config/index.md
@@ -1456,7 +1456,7 @@ By default Vitest will run all of your test cases even if some of them fail. Thi
 ### retry
 
 - **Type:** `number`
-- **Default:** `1`
+- **Default:** `0`
 - **CLI:** `--retry=<value>`
 - **Version:** Since Vitest 0.32.3
 
diff --git a/docs/guide/cli.md b/docs/guide/cli.md
index 128e867ace7e..84f5d0704376 100644
--- a/docs/guide/cli.md
+++ b/docs/guide/cli.md
@@ -93,7 +93,7 @@ Run only [benchmark](https://vitest.dev/guide/features.html#benchmarking-experim
 | `--inspect` | Enables Node.js inspector |
 | `--inspect-brk` | Enables Node.js inspector with break |
 | `--bail <number>` | Stop test execution when given number of tests have failed |
-| `--retry <number>` | Retry the test specific number of times if it fails |
+| `--retry <times>` | Retry the test specific number of times if it fails |
 | `-h, --help` | Display available CLI options |
 
 ::: tip
diff --git a/packages/vitest/src/defaults.ts b/packages/vitest/src/defaults.ts
index 50c646365434..b75f658eb304 100644
--- a/packages/vitest/src/defaults.ts
+++ b/packages/vitest/src/defaults.ts
@@ -94,7 +94,6 @@ const config = {
     exclude: defaultExclude,
   },
   slowTestThreshold: 300,
-  retry: 1,
 }
 
 export const configDefaults: Required<Pick<UserConfig, keyof typeof config>> = Object.freeze(config)
diff --git a/packages/vitest/src/node/cli.ts b/packages/vitest/src/node/cli.ts
index c68d17f4c362..f8d16d7b3975 100644
--- a/packages/vitest/src/node/cli.ts
+++ b/packages/vitest/src/node/cli.ts
@@ -48,7 +48,7 @@ cli
   .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 <number>', 'Retry the test specific number of times if it fails.', { default: 1 })
+  .option('--retry <times>', 'Retry the test specific number of times if it fails', { default: 0 })
   .help()
 
 cli
diff --git a/packages/vitest/src/types/config.ts b/packages/vitest/src/types/config.ts
index 60413c9e8ae4..6c2a79706b69 100644
--- a/packages/vitest/src/types/config.ts
+++ b/packages/vitest/src/types/config.ts
@@ -601,7 +601,7 @@ export interface InlineConfig {
   /**
    * Retry the test specific number of times if it fails.
    *
-   * @default 1
+   * @default 0
   */
   retry?: number
 }
diff --git a/test/config/fixtures/retry/vitest.config.ts b/test/config/fixtures/retry/vitest.config.ts
index 35ad214c9cab..117d98336427 100644
--- a/test/config/fixtures/retry/vitest.config.ts
+++ b/test/config/fixtures/retry/vitest.config.ts
@@ -3,6 +3,6 @@ import { defineConfig } from 'vitest/config'
 export default defineConfig({
   test: {
     include: ['*.test.ts'],
-    retry: 4,
+    retry: 3,
   },
 })