Fix flakes in FIRCrashlyticsReportTests.m

Author: paulb777

Crashlytics/Crashlytics/Models/FIRCLSInternalReport.m

@@ -16,6 +16,7 @@
 // experiment
 
 #import "Crashlytics/Crashlytics/Models/FIRCLSInternalReport.h"
+#import "Crashlytics/Crashlytics/Private/FIRCLSInternalReport_Private.h"
 
 #import "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
 #import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
@@ -53,6 +54,8 @@ @interface FIRCLSInternalReport () {
 
 @implementation FIRCLSInternalReport
 
+@synthesize operationQueue = _operationQueue;
+
 + (instancetype)reportWithPath:(NSString *)path {
   return [[self alloc] initWithPath:path];
 }

Crashlytics/Crashlytics/Private/FIRCLSInternalReport_Private.h

@@ -0,0 +1,25 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#import "Crashlytics/Crashlytics/Models/FIRCLSInternalReport.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FIRCLSInternalReport ()
+
+@property(nonatomic, readonly) NSOperationQueue *operationQueue;
+
+@end
+
+NS_ASSUME_NONNULL_END

Crashlytics/UnitTests/FIRCrashlyticsReportTests.m

@@ -19,6 +19,7 @@
 #import "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
 #import "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
 #import "Crashlytics/Crashlytics/Models/FIRCLSInternalReport.h"
+#import "Crashlytics/Crashlytics/Private/FIRCLSInternalReport_Private.h"
 #import "Crashlytics/Crashlytics/Private/FIRCrashlyticsReport_Private.h"
 #import "Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRCrashlyticsReport.h"
 
@@ -244,6 +245,7 @@ - (void)testCustomKeysLimits {
     NSString *key = [NSString stringWithFormat:@"key_%i", i];
     [report setCustomValue:@"hello" forKey:key];
   }
+  [report.internalReport.operationQueue waitUntilAllOperationsAreFinished];
 
   NSArray *entriesI = FIRCLSFileReadSections(
       [[report.internalReport pathForContentFile:FIRCLSReportUserIncrementalKVFile]
@@ -265,6 +267,7 @@ - (void)testLogsNoExisting {
 
   [report log:@"Normal log without formatting"];
   [report logWithFormat:@"%@, %@", @"First", @"Second"];
+  [report.internalReport.operationQueue waitUntilAllOperationsAreFinished];
 
   NSArray *entries = FIRCLSFileReadSections(
       [[report.internalReport pathForContentFile:FIRCLSReportLogAFile] fileSystemRepresentation],
@@ -283,6 +286,7 @@ - (void)testLogsWithExisting {
 
   [report log:@"Normal log without formatting"];
   [report logWithFormat:@"%@, %@", @"First", @"Second"];
+  [report.internalReport.operationQueue waitUntilAllOperationsAreFinished];
 
   NSArray *entries = FIRCLSFileReadSections(
       [[report.internalReport pathForContentFile:FIRCLSReportLogAFile] fileSystemRepresentation],
@@ -302,6 +306,7 @@ - (void)testLogLimits {
   for (int i = 0; i < 2000; i++) {
     [report log:@"0123456789"];
   }
+  [report.internalReport.operationQueue waitUntilAllOperationsAreFinished];
 
   unsigned long long sizeA = [[[NSFileManager defaultManager]
       attributesOfItemAtPath:[report.internalReport pathForContentFile:FIRCLSReportLogAFile]