fix: flaky FIRCLSSettingsTests.m

Crashlytics/Crashlytics/Models/FIRCLSSettings.m

@@ -190,19 +190,15 @@ - (NSDictionary *)loadCacheKey {
 
 - (void)deleteCachedSettings {
   __weak FIRCLSSettings *weakSelf = self;
-#ifndef FIREBASE_IS_NIGHTLY_TESTING
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
-#endif
     __strong FIRCLSSettings *strongSelf = weakSelf;
     if ([strongSelf.fileManager fileExistsAtPath:strongSelf.fileManager.settingsFilePath]) {
       [strongSelf.fileManager removeItemAtPath:strongSelf.fileManager.settingsFilePath];
     }
     if ([strongSelf.fileManager fileExistsAtPath:strongSelf.fileManager.settingsCacheKeyPath]) {
       [strongSelf.fileManager removeItemAtPath:strongSelf.fileManager.settingsCacheKeyPath];
     }
-#ifndef FIREBASE_IS_NIGHTLY_TESTING
   });
-#endif
 
   @synchronized(self) {
     self.isCacheKeyExpired = YES;

Crashlytics/UnitTests/FIRCLSSettingsTests.m

@@ -75,7 +75,7 @@
 
 - (void)setUp {
   [super setUp];
-
+  [self drainBackgroundQueue];
   _fileManager = [[FIRCLSMockFileManager alloc] init];
 
   _appIDModel = [[FABMockApplicationIdentifierModel alloc] init];
@@ -134,7 +134,11 @@
 
   [self.settings cacheSettingsWithGoogleAppID:googleAppID currentTimestamp:currentTimestamp];
 
+  if (expectedRemoveCount) {
+    [self drainBackgroundQueue];
+  }
+
   [self waitForExpectations:@[ self.fileManager.removeExpectation ] timeout:1];
 }
 
 - (void)reloadFromCacheWithGoogleAppID:(NSString *)googleAppID
@@ -147,9 +151,19 @@
 
   [self.settings reloadFromCacheWithGoogleAppID:googleAppID currentTimestamp:currentTimestamp];
 
+  if (expectedRemoveCount) {
+    [self drainBackgroundQueue];
+  }
+
   [self waitForExpectations:@[ self.fileManager.removeExpectation ] timeout:5.0];
 }
 
+- (void)drainBackgroundQueue {
+  dispatch_sync(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
+                    // This queue is used by `- [FIRCLSSettings deleteCachedSettings]`.
+                });
+}
+
 - (void)testActivatedSettingsCached {
   NSError *error = nil;
   [self writeSettings:FIRCLSTestSettingsActivated error:&error];