Register test observer in main queue (#834)

pointfreeco · Apr 5, 2024 · c81750d · c81750d
1 parent 7083a44
commit c81750d
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/Sources/SnapshotTesting/AssertSnapshot.swift b/Sources/SnapshotTesting/AssertSnapshot.swift
@@ -371,18 +371,24 @@ func sanitizePathComponent(_ string: String) -> String {
 // We need to clean counter between tests executions in order to support test-iterations.
 private class CleanCounterBetweenTestCases: NSObject, XCTestObservation {
   private static var registered = false
-  private static var registerQueue = DispatchQueue(
-    label: "co.pointfree.SnapshotTesting.testObserver")
 
   static func registerIfNeeded() {
-    registerQueue.sync {
-      if !registered {
-        registered = true
-        XCTestObservationCenter.shared.addTestObserver(CleanCounterBetweenTestCases())
+    if Thread.isMainThread {
+      doRegisterIfNeeded()
+    } else {
+      DispatchQueue.main.sync { 
+        doRegisterIfNeeded()
       }
     }
   }
 
+  private static func doRegisterIfNeeded() {
+    if !registered {
+      registered = true
+      XCTestObservationCenter.shared.addTestObserver(CleanCounterBetweenTestCases())
+    }
+  }
+
   func testCaseDidFinish(_ testCase: XCTestCase) {
     counterQueue.sync {
       counterMap = [:]