Merge pull request #18595 from wordpress-mobile/fix/xctest-wait-flakiness

hassaanelgarem · web-flow · commit 2db1a9d10dc1 · 2022-05-15T15:28:18.000+02:00
Enhance the stability of flaky unit tests
diff --git a/WordPress/WordPressTest/Extensions/XCTestCase+Wait.swift b/WordPress/WordPressTest/Extensions/XCTestCase+Wait.swift
@@ -7,6 +7,8 @@ extension XCTestCase {
             waitExpectation.fulfill()
         }
 
-        waitForExpectations(timeout: duration)
+        // We wait for the duration + 1 second to allow some buffer in case the dispatched block gets
+        // delayed by GCD for any reason for even 1 microsecond.
+        waitForExpectations(timeout: duration + 1)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ extension XCTestCase {`
`7`	`7`	`waitExpectation.fulfill()`
`8`	`8`	`}`
`9`	`9`
`10`		`- waitForExpectations(timeout: duration)`
	`10`	`+ // We wait for the duration + 1 second to allow some buffer in case the dispatched block gets`
	`11`	`+ // delayed by GCD for any reason for even 1 microsecond.`
	`12`	`+ waitForExpectations(timeout: duration + 1)`
`11`	`13`	`}`
`12`	`14`	`}`