De-flake three unit tests (async ordering, sync timeout, off-main Core Data)

Modules/Tests/WordPressCommentsTests/CommentDetailViewModelTests.swift

@@ -289,7 +289,7 @@ struct CommentDetailViewModelTests {
         async let appear: Void = vm.onAppear()
         await waitUntil { !service.fetchCommentInvocations.isEmpty }
         service.resolveFetch(callIndex: 0, with: detail)
-        await waitUntil { !service.numberOfRepliesInvocations.isEmpty }
+        await waitUntil { vm.content == .loaded(detail) && !service.numberOfRepliesInvocations.isEmpty }
 
         // The comment is on screen while the count is still in flight, but
         // actions wait for it so a reply can't race a stale count.

Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-ltr.imageset/Contents.json

@@ -1,8 +1,25 @@
 {
   "images" : [
     {
-      "filename" : "wp-migration-notifications-explainer-ltr-light.pdf",
-      "idiom" : "universal"
+      "filename" : "wp-migration-notifications-explainer-ltr-light@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "wp-migration-notifications-explainer-ltr-light@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "wp-migration-notifications-explainer-ltr-dark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
     },
     {
       "appearances" : [
@@ -11,8 +28,9 @@
           "value" : "dark"
         }
       ],
-      "filename" : "wp-migration-notifications-explainer-ltr-dark.pdf",
-      "idiom" : "universal"
+      "filename" : "wp-migration-notifications-explainer-ltr-dark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Sources/Jetpack/Resources/Assets.xcassets/WordPress Migration/wp-migration-notifications-explainer-rtl.imageset/Contents.json

@@ -1,8 +1,25 @@
 {
   "images" : [
     {
-      "filename" : "wp-migration-notifications-explainer-rtl-light.pdf",
-      "idiom" : "universal"
+      "filename" : "wp-migration-notifications-explainer-rtl-light@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "wp-migration-notifications-explainer-rtl-light@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "wp-migration-notifications-explainer-rtl-dark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
     },
     {
       "appearances" : [
@@ -11,8 +28,9 @@
           "value" : "dark"
         }
       ],
-      "filename" : "wp-migration-notifications-explainer-rtl-dark.pdf",
-      "idiom" : "universal"
+      "filename" : "wp-migration-notifications-explainer-rtl-dark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

Tests/KeystoneTests/Tests/Services/BlogJetpackTests.swift

@@ -188,7 +188,7 @@ class BlogJetpackTests: CoreDataTestCase {
         }
 
         // No blogs should be saved after the sync blogs operation finishes.
-        wait(for: [syncExpectation], timeout: 1.0)
+        wait(for: [syncExpectation], timeout: 5.0)
         XCTAssertEqual(Blog.count(in: mainContext), 0)
     }
 

Tests/KeystoneTests/Tests/Services/ReaderTopicServiceTest.swift

@@ -439,7 +439,7 @@ final class ReaderTopicSwiftTest: CoreDataTestCase {
     /**
         Ensure that pre-existing site topic is not deleted when fetching siteTopicForSiteWithID
      */
-    func testReaderSiteTopicUpdated() async throws {
+    @MainActor func testReaderSiteTopicUpdated() async throws {
         // GIVEN:
         let service = ReaderTopicService(coreDataStack: contextManager)
         let siteID = 1