account for swift 6 sendable's house of cards

ethanndickson · ethanndickson · commit e2a0f1b453f8 · 2025-04-09T10:02:25.000Z
diff --git a/Coder-Desktop/Coder-DesktopTests/FilePickerTests.swift b/Coder-Desktop/Coder-DesktopTests/FilePickerTests.swift
@@ -103,8 +103,8 @@ struct FilePickerTests {
                 try disclosureGroup.expand()
 
                 // Disclosure group should expand out to 3 more directories
-                try #expect(await eventually { @MainActor in
-                    return try view.findAll(ViewType.DisclosureGroup.self).count == 6
+                #expect(await eventually { @MainActor in
+                    return view.findAll(ViewType.DisclosureGroup.self).count == 6
                 })
             }
         }
diff --git a/Coder-Desktop/Coder-DesktopTests/FileSyncDaemonTests.swift b/Coder-Desktop/Coder-DesktopTests/FileSyncDaemonTests.swift
@@ -81,9 +81,9 @@ class FileSyncDaemonTests {
         // Write a file to Alpha
         let alphaFile = mutagenAlphaDirectory.appendingPathComponent("test.txt")
         try "Hello, World!".write(to: alphaFile, atomically: true, encoding: .utf8)
-        try #expect(
+        #expect(
             await eventually(timeout: .seconds(5), interval: .milliseconds(100)) { @MainActor in
-                return try FileManager.default.fileExists(
+                return FileManager.default.fileExists(
                     atPath: self.mutagenBetaDirectory.appending(path: "test.txt").path()
                 )
             })
diff --git a/Coder-Desktop/Coder-DesktopTests/Util.swift b/Coder-Desktop/Coder-DesktopTests/Util.swift
@@ -61,26 +61,19 @@ extension Inspection: @unchecked Sendable, @retroactive InspectionEmissary {}
 public func eventually(
     timeout: Duration = .milliseconds(500),
     interval: Duration = .milliseconds(10),
-    condition: @escaping () async throws -> Bool
-) async throws -> Bool {
+    condition: @Sendable () async throws -> Bool
+) async rethrows -> Bool {
     let endTime = ContinuousClock.now.advanced(by: timeout)
 
-    var lastError: Error?
-
     while ContinuousClock.now < endTime {
         do {
             if try await condition() { return true }
-            lastError = nil
         } catch {
-            lastError = error
             try await Task.sleep(for: interval)
         }
     }
 
-    if let lastError {
-        throw lastError
-    }
-    return false
+    return try await condition()
 }
 
 extension FileManager {

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,8 @@ struct FilePickerTests {`
`103`	`103`	`try disclosureGroup.expand()`
`104`	`104`
`105`	`105`	`// Disclosure group should expand out to 3 more directories`
`106`		`- try #expect(await eventually { @MainActor in`
`107`		`- return try view.findAll(ViewType.DisclosureGroup.self).count == 6`
	`106`	`+ #expect(await eventually { @MainActor in`
	`107`	`+ return view.findAll(ViewType.DisclosureGroup.self).count == 6`
`108`	`108`	`})`
`109`	`109`	`}`
`110`	`110`	`}`