[Infra] Attempt to fix some Crashlytics flakes (#13432)

Author: ncooke3

Crashlytics/UnitTests/FIRCLSReportManagerTests.m

@@ -23,6 +23,8 @@
 #import "FBLPromises.h"
 #endif
 
+#import "FBLPromise+Testing.h"
+
 #include "Crashlytics/Crashlytics/Components/FIRCLSContext.h"
 #include "Crashlytics/Crashlytics/Components/FIRCLSCrashedMarkerFile.h"
 #import "Crashlytics/Crashlytics/Controllers/FIRCLSAnalyticsManager.h"
@@ -201,17 +203,10 @@ - (NSArray *)uploadReportArray {
 #pragma mark - File/Directory Handling
 - (void)testCreatesNewReportOnStart {
   FBLPromise<NSNumber *> *promise = [self->_reportManager startWithProfiling];
+  FBLWaitForPromisesWithTimeout(1.0);
 
-  XCTestExpectation *expectation =
-      [[XCTestExpectation alloc] initWithDescription:@"waiting on promise"];
-  [promise then:^id _Nullable(NSNumber *_Nullable value) {
-    XCTAssertTrue([value boolValue]);
-    XCTAssertEqual([[self contentsOfActivePath] count], 1);
-    [expectation fulfill];
-    return value;
-  }];
-
-  [self waitForExpectations:@[ expectation ] timeout:1.0];
+  XCTAssertTrue([promise.value boolValue]);
+  XCTAssertEqual([[self contentsOfActivePath] count], 1);
 }
 
 - (void)waitForPromise:(FBLPromise<NSNumber *> *)promise {
@@ -314,10 +309,11 @@ - (void)testMetricKitResolvesPromiseIfNoDiagnostics {
 
 - (void)testExistingUnimportantReportOnStartWithDataCollectionDisabled {
   // create a report and put it in place
-  [self createActiveReport];
+  XCTAssertNotNil([self createActiveReport]);
 
   // Starting with data collection disabled should report in nothing changing
   [self startReportManagerWithDataCollectionEnabled:NO];
+  FBLWaitForPromisesWithTimeout(1.0);
 
   XCTAssertEqual([[self contentsOfActivePath] count], 1);