Additional test to make test various duration tasks

sourcegraph · Jan 31, 2025 · d325716 · d325716
1 parent beb9d5f
commit d325716
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 9 deletions.
diff --git a/lib/shared/src/misc/observable.test.ts b/lib/shared/src/misc/observable.test.ts
@@ -1190,4 +1190,25 @@ describe('retry', () => {
 
         expect(results).toEqual(['value', 'completed'])
     })
+
+    test('should retry tasks with various duration', async () => {
+        vi.useFakeTimers()
+
+        let count = 0
+        const source = new Observable(observer => {
+            count++
+            const randomTimeout = Math.floor(Math.random() * 10) + 1
+            setTimeout(() => observer.error(new Error(`Test Error ${count}`)), randomTimeout)
+        })
+
+        const errors: Error[] = []
+        source.pipe(retry(100)).subscribe({
+            error: err => errors.push(err),
+        })
+
+        await vi.advanceTimersByTimeAsync(1000)
+
+        expect(errors.length).toBe(1)
+        expect(errors[0].message).toBe('Test Error 101')
+    })
 })
diff --git a/lib/shared/src/misc/observable.ts b/lib/shared/src/misc/observable.ts
@@ -1365,16 +1365,15 @@ export function retry<T>(count: number): (source: ObservableLike<T>) => Observab
             function subscribe() {
                 subscription = source.subscribe({
                     next(value) {
-                        observer.next(value)
-                        retries = 0
+                        if (subscription) {
+                            observer.next(value)
+                            retries = 0
+                        }
                     },
                     error(err) {
                         if (retries < count && subscription) {
                             retries++
-                            if (subscription) {
-                                unsubscribe(subscription)
-                                subscription = null
-                            }
+                            unsuscribeThis()
                             subscribe()
                         } else {
                             observer.error(err)
@@ -1388,13 +1387,15 @@ export function retry<T>(count: number): (source: ObservableLike<T>) => Observab
                 })
             }
 
-            subscribe()
-
-            return () => {
+            function unsuscribeThis() {
                 if (subscription) {
                     unsubscribe(subscription)
                     subscription = undefined
                 }
             }
+
+            subscribe()
+
+            return () => unsuscribeThis()
         })
 }