Fixes with alwaysThrottleRetries

Author: jackpope

packages/react-cache/src/__tests__/ReactCacheOld-test.internal.js

@@ -218,15 +218,28 @@ describe('ReactCache', () => {
     await waitForPaint(['Suspend! [1]', 'Loading...']);
     jest.advanceTimersByTime(100);
     assertLog(['Promise resolved [1]']);
-    await waitForAll([1, 'Suspend! [2]']);
+    await waitForAll([
+      1,
+      'Suspend! [2]',
+      ...(gate('alwaysThrottleRetries')
+        ? []
+        : [1, 'Suspend! [2]', 'Suspend! [3]']),
+    ]);
 
     jest.advanceTimersByTime(100);
-    assertLog(['Promise resolved [2]']);
-    await waitForAll([1, 2, 'Suspend! [3]']);
+    assertLog([
+      'Promise resolved [2]',
+      ...(gate('alwaysThrottleRetries') ? [] : ['Promise resolved [3]']),
+    ]);
+    await waitForAll([
+      1,
+      2,
+      ...(gate('alwaysThrottleRetries') ? ['Suspend! [3]'] : [3]),
+    ]);
 
     jest.advanceTimersByTime(100);
-    assertLog(['Promise resolved [3]']);
-    await waitForAll([1, 2, 3]);
+    assertLog(gate('alwaysThrottleRetries') ? ['Promise resolved [3]'] : []);
+    await waitForAll(gate('alwaysThrottleRetries') ? [1, 2, 3] : []);
 
     await act(() => jest.advanceTimersByTime(100));
     expect(root).toMatchRenderedOutput('123');

packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js

@@ -175,7 +175,12 @@ describe('ReactSuspense', () => {
     // Resolve first Suspense's promise and switch back to the normal view. The
     // second Suspense should still show the placeholder
     await act(() => resolveText('A'));
-    assertLog(['A', 'Suspend! [B]', 'Suspend! [B]']);
+    assertLog([
+      'A',
+      ...(gate('alwaysThrottleRetries')
+        ? ['Suspend! [B]', 'Suspend! [B]']
+        : []),
+    ]);
     expect(container.textContent).toEqual('ALoading B...');
 
     // Resolve the second Suspense's promise resolves and switche back to the
@@ -686,7 +691,13 @@ describe('ReactSuspense', () => {
       'Suspend! [Child 2]',
     ]);
     await resolveText('Child 1');
-    await waitForAll(['Child 1', 'Suspend! [Child 2]']);
+    await waitForAll([
+      'Child 1',
+      'Suspend! [Child 2]',
+      ...(gate('alwaysThrottleRetries')
+        ? []
+        : ['Child 1', 'Suspend! [Child 2]']),
+    ]);
 
     jest.advanceTimersByTime(6000);
 

packages/react-reconciler/src/__tests__/ReactSuspenseCallback-test.js

@@ -93,7 +93,10 @@ describe('ReactSuspense', () => {
     ReactNoop.render(element);
     await waitForAll([]);
     expect(ReactNoop).toMatchRenderedOutput('Waiting');
-    expect(ops).toEqual([new Set([promise])]);
+    expect(ops).toEqual([
+      new Set([promise]),
+      ...(gate('alwaysThrottleRetries') ? [] : new Set([promise])),
+    ]);
     ops = [];
 
     await act(() => resolve());
@@ -132,7 +135,10 @@ describe('ReactSuspense', () => {
     ReactNoop.render(element);
     await waitForAll([]);
     expect(ReactNoop).toMatchRenderedOutput('Waiting Tier 1');
-    expect(ops).toEqual([new Set([promise1])]);
+    expect(ops).toEqual([
+      new Set([promise1]),
+      ...(gate('alwaysThrottleRetries') ? [] : new Set([promise1, promise2])),
+    ]);
     ops = [];
 
     await act(() => resolve1());
@@ -178,7 +184,10 @@ describe('ReactSuspense', () => {
     await waitForAll([]);
     expect(ReactNoop).toMatchRenderedOutput('Waiting Tier 2');
     expect(ops1).toEqual([]);
-    expect(ops2).toEqual([new Set([promise])]);
+    expect(ops2).toEqual([
+      new Set([promise]),
+      ...(gate('alwaysThrottleRetries') ? [] : [new Set([promise])]),
+    ]);
   });
 
   // @gate enableSuspenseCallback

packages/react-reconciler/src/__tests__/ReactSuspenseList-test.js

@@ -258,7 +258,11 @@ describe('ReactSuspenseList', () => {
     );
 
     await act(() => C.resolve());
-    assertLog(['Suspend! [B]', 'C', 'Suspend! [B]']);
+    assertLog(
+      gate('alwaysThrottleRetries')
+        ? ['Suspend! [B]', 'C', 'Suspend! [B]']
+        : ['C'],
+    );
 
     expect(ReactNoop).toMatchRenderedOutput(
       <>
@@ -1979,7 +1983,11 @@ describe('ReactSuspenseList', () => {
 
     await B.resolve();
 
-    await waitForAll(['B', 'Suspend! [C]']);
+    await waitForAll([
+      'B',
+      'Suspend! [C]',
+      ...(!gate('alwaysThrottleRetries') ? ['Suspend! [C]'] : []),
+    ]);
 
     // Incremental loading is suspended.
     jest.advanceTimersByTime(500);
@@ -2742,7 +2750,9 @@ describe('ReactSuspenseList', () => {
         <span>Loading...</span>
       </>,
     );
-    expect(onRender).toHaveBeenCalledTimes(1);
+    expect(onRender).toHaveBeenCalledTimes(
+      gate('alwaysThrottleRetries') ? 1 : 2,
+    );
 
     // The treeBaseDuration should be the time to render each child. The last
     // one counts the fallback time.
@@ -2765,12 +2775,18 @@ describe('ReactSuspenseList', () => {
         <span>C</span>
       </>,
     );
-    expect(onRender).toHaveBeenCalledTimes(2);
+    expect(onRender).toHaveBeenCalledTimes(
+      gate('alwaysThrottleRetries') ? 2 : 3,
+    );
 
     // actualDuration
-    expect(onRender.mock.calls[1][2]).toBe(1 + 4 + 5);
+    expect(onRender.mock.calls[1][2]).toBe(
+      gate('alwaysThrottleRetries') ? 1 + 4 + 5 : 5,
+    );
     // treeBaseDuration
-    expect(onRender.mock.calls[1][3]).toBe(1 + 4 + 5);
+    expect(onRender.mock.calls[1][3]).toBe(
+      gate('alwaysThrottleRetries') ? 1 + 4 + 5 : 8,
+    );
 
     ReactNoop.render(<App addRow={true} suspendTail={true} />);
 
@@ -2802,7 +2818,9 @@ describe('ReactSuspenseList', () => {
         <span>Loading...</span>
       </>,
     );
-    expect(onRender).toHaveBeenCalledTimes(4);
+    expect(onRender).toHaveBeenCalledTimes(
+      gate('alwaysThrottleRetries') ? 4 : 5,
+    );
 
     // The treeBaseDuration should be the time to render the first two
     // children and then two fallbacks.
@@ -2811,9 +2829,13 @@ describe('ReactSuspenseList', () => {
     // with force fallback mode.
 
     // actualDuration
-    expect(onRender.mock.calls[2][2]).toBe((1 + 4 + 5 + 3) * 2 + 3);
+    expect(onRender.mock.calls[2][2]).toBe(
+      gate('alwaysThrottleRetries') ? (1 + 4 + 5 + 3) * 2 + 3 : 10,
+    );
     // treeBaseDuration
-    expect(onRender.mock.calls[2][3]).toBe(1 + 4 + 3 + 3);
+    expect(onRender.mock.calls[2][3]).toBe(
+      gate('alwaysThrottleRetries') ? 1 + 4 + 3 + 3 : 10,
+    );
 
     await act(() => C.resolve());
     assertLog(['C', 'Suspend! [D]', 'Suspend! [D]']);
@@ -2826,10 +2848,14 @@ describe('ReactSuspenseList', () => {
       </>,
     );
 
-    expect(onRender).toHaveBeenCalledTimes(6);
+    expect(onRender).toHaveBeenCalledTimes(
+      gate('alwaysThrottleRetries') ? 6 : 7,
+    );
 
     // actualDuration
-    expect(onRender.mock.calls[5][2]).toBe(12);
+    expect(onRender.mock.calls[5][2]).toBe(
+      gate('alwaysThrottleRetries') ? 12 : 17,
+    );
     // treeBaseDuration
     expect(onRender.mock.calls[5][3]).toBe(1 + 4 + 5 + 3);
   });

packages/react-reconciler/src/__tests__/ReactUse-test.js

@@ -2087,12 +2087,12 @@ describe('ReactUse', () => {
     assertLog(['Async text requested [World]']);
 
     await act(() => resolveTextRequests('World'));
-    assertConsoleErrorDev(
+    assertConsoleErrorDev([
       'A component was suspended by an uncached promise. ' +
         'Creating promises inside a Client Component or hook is not yet supported, ' +
         'except via a Suspense-compatible library or framework.\n' +
         '    in App (at **)',
-    );
+    ]);
 
     assertLog(['Hi', 'World']);
     expect(root).toMatchRenderedOutput('Hi World');
@@ -2139,13 +2139,13 @@ describe('ReactUse', () => {
     assertLog(['Async text requested [World]']);
 
     await act(() => resolveTextRequests('World'));
-    assertConsoleErrorDev(
+    assertConsoleErrorDev([
       'A component was suspended by an uncached promise. ' +
         'Creating promises inside a Client Component or hook is not yet supported, ' +
         'except via a Suspense-compatible library or framework.\n' +
         '    in div (at **)\n' +
         '    in App (at **)',
-    );
+    ]);
 
     assertLog(['Hi', 'World']);
     expect(root).toMatchRenderedOutput(<div>Hi World</div>);

packages/react-reconciler/src/__tests__/useSyncExternalStore-test.js

@@ -428,7 +428,14 @@ describe('useSyncExternalStore', () => {
     await act(() => {
       resolveText('A');
     });
-    assertLog(['A', 'B', 'A', 'B', 'B']);
+    assertLog([
+      'A',
+      'B',
+      'A',
+      'B',
+      'B',
+      ...(gate('alwaysThrottleRetries') ? [] : ['B']),
+    ]);
 
     expect(root).toMatchRenderedOutput('AB');
   });