More flake fixes

Author: paulb777

Crashlytics/UnitTests/FIRCLSContextManagerTests.m

@@ -42,6 +42,10 @@ @implementation FIRCLSContextManagerTests
 
 - (void)setUp {
   self.fileManager = [[FIRCLSMockFileManager alloc] init];
+  [[NSFileManager defaultManager] createDirectoryAtPath:self.fileManager.rootPath
+                              withIntermediateDirectories:YES
+                                               attributes:nil
+                                                    error:nil];
   [self.fileManager createReportDirectories];
   [self.fileManager setupNewPathForExecutionIdentifier:TestContextReportID];
 

Crashlytics/UnitTests/FIRCLSExistingReportManagerTests.m

@@ -54,10 +54,11 @@ - (void)setUp {
 
   self.fileManager = [[FIRCLSTempMockFileManager alloc] init];
 
-  // Cleanup potential artifacts from other test files.
+  // Clean up the directory and then re-create it to ensure a fresh state
   if ([[NSFileManager defaultManager] fileExistsAtPath:[self.fileManager rootPath]]) {
     assert([self.fileManager removeItemAtPath:[self.fileManager rootPath]]);
   }
+  [self.fileManager createReportDirectories];
 
   // Allow nil values only in tests
 #pragma clang diagnostic push