From 1c20d3d071dbe36d44345ee24aafbc7a8d9b9f31 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Fri, 15 Apr 2022 11:49:06 -0500
Subject: [PATCH] Stabilize flakey prerender test (#36193)

---
 test/e2e/prerender.test.ts | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/test/e2e/prerender.test.ts b/test/e2e/prerender.test.ts
index b1514a54b9712..36a0f6dffcd29 100644
--- a/test/e2e/prerender.test.ts
+++ b/test/e2e/prerender.test.ts
@@ -1975,13 +1975,18 @@ describe('Prerender', () => {
 
         expect($('p').text()).toMatch(/Post:.*?test-manual-1/)
 
-        const res2 = await fetchViaHTTP(
-          next.url,
-          '/blocking-fallback/test-manual-1'
-        )
-        const html2 = await res2.text()
-        const $2 = cheerio.load(html2)
-        expect(res2.headers.get('x-nextjs-cache')).toMatch(/(HIT|STALE)/)
+        let $2
+
+        await check(async () => {
+          const res2 = await fetchViaHTTP(
+            next.url,
+            '/blocking-fallback/test-manual-1'
+          )
+          const html2 = await res2.text()
+          $2 = cheerio.load(html2)
+
+          return res2.headers.get('x-nextjs-cache')
+        }, /(HIT|STALE)/)
 
         expect(initialTime).toBe($2('#time').text())
 
@@ -1994,7 +1999,7 @@ describe('Prerender', () => {
           { redirect: 'manual' }
         )
 
-        expect(res2.status).toBe(200)
+        expect(res3.status).toBe(200)
         const revalidateData = await res3.json()
         expect(revalidateData.revalidated).toBe(true)