review

Author: paulb777

Crashlytics/UnitTests/FIRCLSReportUploaderTests.m

@@ -282,11 +282,13 @@ - (void)runUploadPackagedReportWithUrgency:(BOOL)urgent {
   [self.uploader uploadPackagedReportAtPath:[self packagePath]
                         dataCollectionToken:FIRCLSDataCollectionToken.validToken
                                    asUrgent:urgent];
-
   XCTAssertNotNil(self.mockDataTransport.sendDataEvent_event);
 
-  // Wait a little bit for the file to be removed.
-  [NSRunLoop.currentRunLoop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
+  // Poll until the file is removed, with a timeout to prevent an infinite loop.
+  NSDate *timeoutDate = [NSDate dateWithTimeIntervalSinceNow:1.0];
+  while (self.fileManager.removedItemAtPath_path == nil && [timeoutDate timeIntervalSinceNow] > 0) {
+    [NSRunLoop.currentRunLoop runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.01]];
+  }
   XCTAssertEqualObjects(self.fileManager.removedItemAtPath_path, [self packagePath]);
 }
 

FirebaseMessaging/Sources/FIRMessagingRmqManager.m

@@ -501,7 +501,7 @@ - (void)openDatabase {
 #ifdef SQLITE_OPEN_FILEPROTECTION_NONE
       flags |= SQLITE_OPEN_FILEPROTECTION_NONE;
 #endif
-      int result = sqlite3_open_v2([path UTF8String], &self -> _database, flags, NULL);
+      int result = sqlite3_open_v2([path UTF8String], &self->_database, flags, NULL);
       if (result != SQLITE_OK) {
         NSString *errorString = FIRMessagingStringFromSQLiteResult(result);
         NSString *errorMessage = [NSString
@@ -522,7 +522,7 @@ - (void)openDatabase {
 #ifdef SQLITE_OPEN_FILEPROTECTION_NONE
       flags |= SQLITE_OPEN_FILEPROTECTION_NONE;
 #endif
-      int result = sqlite3_open_v2([path UTF8String], &self -> _database, flags, NULL);
+      int result = sqlite3_open_v2([path UTF8String], &self->_database, flags, NULL);
       if (result != SQLITE_OK) {
         NSString *errorString = FIRMessagingStringFromSQLiteResult(result);
         NSString *errorMessage =

Package.swift

@@ -1449,52 +1449,31 @@ func firestoreWrapperTarget() -> Target {
 
 func crashlyticsUnitTestChooser() -> Target {
   // Don't run flaky tests in nightly runs.
-  if Context.environment["CRASHLYTICS_NIGHTLY"] != nil {
-    return .testTarget(
-      name: "FirebaseCrashlyticsUnit",
-      dependencies: ["FirebaseCrashlytics", .product(name: "OCMock", package: "ocmock")],
-      path: "Crashlytics/UnitTests",
-      exclude: ["FIRCrashlyticsReportTests.m"], // Flaky
-      resources: [
-        .copy("FIRCLSMachO/machO_data"),
-        .copy("Data"),
-      ],
-      cSettings: [
-        .headerSearchPath("../.."),
-        .define("DISPLAY_VERSION", to: firebaseVersion),
-        .define("CLS_SDK_NAME", to: "Crashlytics iOS SDK", .when(platforms: [.iOS])),
-        .define(
-          "CLS_SDK_NAME",
-          to: "Crashlytics macOS SDK",
-          .when(platforms: [.macOS, .macCatalyst])
-        ),
-        .define("CLS_SDK_NAME", to: "Crashlytics tvOS SDK", .when(platforms: [.tvOS])),
-        .define("CLS_SDK_NAME", to: "Crashlytics watchOS SDK", .when(platforms: [.watchOS])),
-      ]
-    )
-  } else {
-    return .testTarget(
-      name: "FirebaseCrashlyticsUnit",
-      dependencies: ["FirebaseCrashlytics", .product(name: "OCMock", package: "ocmock")],
-      path: "Crashlytics/UnitTests",
-      resources: [
-        .copy("FIRCLSMachO/machO_data"),
-        .copy("Data"),
-      ],
-      cSettings: [
-        .headerSearchPath("../.."),
-        .define("DISPLAY_VERSION", to: firebaseVersion),
-        .define("CLS_SDK_NAME", to: "Crashlytics iOS SDK", .when(platforms: [.iOS])),
-        .define(
-          "CLS_SDK_NAME",
-          to: "Crashlytics macOS SDK",
-          .when(platforms: [.macOS, .macCatalyst])
-        ),
-        .define("CLS_SDK_NAME", to: "Crashlytics tvOS SDK", .when(platforms: [.tvOS])),
-        .define("CLS_SDK_NAME", to: "Crashlytics watchOS SDK", .when(platforms: [.watchOS])),
-      ]
-    )
-  }
+  let exclusions: [String] = Context.environment["CRASHLYTICS_NIGHTLY"] != nil ?
+    ["FIRCrashlyticsReportTests.m"] : []
+
+  return .testTarget(
+    name: "FirebaseCrashlyticsUnit",
+    dependencies: ["FirebaseCrashlytics", .product(name: "OCMock", package: "ocmock")],
+    path: "Crashlytics/UnitTests",
+    exclude: exclusions,
+    resources: [
+      .copy("FIRCLSMachO/machO_data"),
+      .copy("Data"),
+    ],
+    cSettings: [
+      .headerSearchPath("../.."),
+      .define("DISPLAY_VERSION", to: firebaseVersion),
+      .define("CLS_SDK_NAME", to: "Crashlytics iOS SDK", .when(platforms: [.iOS])),
+      .define(
+        "CLS_SDK_NAME",
+        to: "Crashlytics macOS SDK",
+        .when(platforms: [.macOS, .macCatalyst])
+      ),
+      .define("CLS_SDK_NAME", to: "Crashlytics tvOS SDK", .when(platforms: [.tvOS])),
+      .define("CLS_SDK_NAME", to: "Crashlytics watchOS SDK", .when(platforms: [.watchOS])),
+    ]
+  )
 }
 
 func firestoreTargets() -> [Target] {