fix: should remove mockPath from callstack whether success or failed

examples/mocks/src/dynamic-module.js

@@ -0,0 +1 @@
+export {}

examples/mocks/src/retry-dynamic-import.ts

@@ -0,0 +1,16 @@
+export async function retryDynamicImport() {
+  let retryTimes = 0
+  const load = async () => {
+    try {
+      return await import('./dynamic-module.js')
+    }
+    catch (e) {
+      if (retryTimes === 3)
+        throw new Error('import dynamic module failed.')
+      retryTimes += 1
+      return await load()
+    }
+  }
+
+  return await load()
+}

examples/mocks/test/retry-dynamic-import.test.ts

@@ -0,0 +1,17 @@
+import { retryDynamicImport } from '../src/retry-dynamic-import'
+
+vi.mock('../src/dynamic-module', () => {
+  return { foo: 'bar' }
+})
+
+describe('retry-dynamic-import', () => {
+  it('should dynamic import module success', async () => {
+    expect(await retryDynamicImport()).toEqual({ foo: 'bar' })
+  })
+  it('should throw when retry over 3 times', async () => {
+    vi.doMock('../src/dynamic-module', () => {
+      throw new Error('foobar')
+    })
+    await expect(retryDynamicImport()).rejects.toThrowError(new Error('import dynamic module failed.'))
+  })
+})

packages/vitest/src/runtime/mocker.ts

@@ -423,11 +423,14 @@ export class VitestMocker {
       return exports
     }
     if (typeof mock === 'function' && !callstack.includes(mockPath) && !callstack.includes(url)) {
-      callstack.push(mockPath)
-      const result = await this.callFunctionMock(mockPath, mock)
-      const indexMock = callstack.indexOf(mockPath)
-      callstack.splice(indexMock, 1)
-      return result
+      try {
+        callstack.push(mockPath)
+        return await this.callFunctionMock(mockPath, mock)
+      }
+      finally {
+        const indexMock = callstack.indexOf(mockPath)
+        callstack.splice(indexMock, 1)
+      }
     }
     if (typeof mock === 'string' && !callstack.includes(mock))
       return mock