review

Author: paulb777

Crashlytics/UnitTests/FIRCLSSettingsTests.m

@@ -137,7 +137,7 @@ - (void)cacheSettingsWithGoogleAppID:(NSString *)googleAppID
 
   [self.settings cacheSettingsWithGoogleAppID:googleAppID currentTimestamp:currentTimestamp];
 
-  [self waitForExpectations:@[ expectation ] timeout:10.0];
+  [self waitForExpectations:@[ expectation ] timeout:4.0];
 }
 
 - (void)reloadFromCacheWithGoogleAppID:(NSString *)googleAppID
@@ -153,7 +153,7 @@ - (void)reloadFromCacheWithGoogleAppID:(NSString *)googleAppID
 
   [self.settings reloadFromCacheWithGoogleAppID:googleAppID currentTimestamp:currentTimestamp];
 
-  [self waitForExpectations:@[ expectation ] timeout:20.0];
+  [self waitForExpectations:@[ expectation ] timeout:6.0];
 }
 
 - (void)testActivatedSettingsCached {

Crashlytics/UnitTests/Mocks/FIRCLSMockFileManager.m

@@ -39,10 +39,9 @@ - (instancetype)init {
 - (BOOL)removeItemAtPath:(NSString *)path {
   @synchronized(self) {
     [self.fileSystemDict removeObjectForKey:path];
+    self.removeCount += 1;
   }
 
-  self.removeCount += 1;
-
   [[NSNotificationCenter defaultCenter]
       postNotificationName:FIRCLSMockFileManagerDidRemoveItemNotification
                     object:self];