[flaky tests] Testing batched operations need to wait

* Currently the Operation Repo is a singleton and shared between tests, so a pending flush could be on the DispatchQueue from a previous test and it will flush unexpectedly.
* This test tests combining operations and intentionally increases the `pollIntervalMilliseconds` to `300`, but a previous flush could interrupt this.

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalUserTests/OneSignalUserTests.swift

@@ -312,6 +312,9 @@ final class OneSignalUserTests: XCTestCase {
         // Increase flush interval to allow all the updates to batch
         OSOperationRepo.sharedInstance.pollIntervalMilliseconds = 300
 
+        // Wait to let any pending flushes in the Operation Repo to run
+        OneSignalCoreMocks.waitForBackgroundThreads(seconds: 0.1)
+
         /* When */
 
         OneSignalUserManagerImpl.sharedInstance.sendSessionTime(100)
@@ -349,7 +352,7 @@ final class OneSignalUserTests: XCTestCase {
 
         /* Then */
 
-        OneSignalCoreMocks.waitForBackgroundThreads(seconds: 0.5)
+        OneSignalCoreMocks.waitForBackgroundThreads(seconds: 1)
 
         let expectedPayload: [String: Any] = [
             "deltas": [

iOS_SDK/OneSignalSDK/OneSignalUserTests/SwitchUserIntegrationTests.swift

@@ -2,6 +2,7 @@ import XCTest
 import OneSignalCore
 import OneSignalCoreMocks
 import OneSignalUserMocks
+@testable import OneSignalOSCore
 @testable import OneSignalUser
 
 final class SwitchUserIntegrationTests: XCTestCase {
@@ -189,6 +190,7 @@ final class SwitchUserIntegrationTests: XCTestCase {
      */
     func testAnonUser_thenIdentifyUserWithConflict_thenLogout_sendsCorrectUpdatesWithNoFetch() throws {
         /* Setup */
+        OneSignalCoreMocks.waitForBackgroundThreads(seconds: 0.5)
 
         let client = MockOneSignalClient()
         OneSignalCoreImpl.setSharedClient(client)
@@ -316,6 +318,11 @@ final class SwitchUserIntegrationTests: XCTestCase {
         let client = MockOneSignalClient()
         OneSignalCoreImpl.setSharedClient(client)
 
+        // Increase flush interval to allow all the updates to batch
+        OSOperationRepo.sharedInstance.pollIntervalMilliseconds = 300
+        // Wait to let any pending flushes in the Operation Repo to run
+        OneSignalCoreMocks.waitForBackgroundThreads(seconds: 0.1)
+
         // 1. Set up mock responses for the first anonymous user
         let tagsUserAnon = ["tag_anon": "value_anon"]
         MockUserRequests.setDefaultCreateAnonUserResponses(with: client)