Skip to content

Remove @unchecked Sendable #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
katiewasnothere merged 2 commits into from
Jun 24, 2025
Merged

Remove @unchecked Sendable #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba3e604
Remove `@unchecked Sendable` where it's no longer needed
dkovba Jun 23, 2025
b20847b
Remove the need for a `Sendable` conformance
dkovba Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions Tests/CLITests/Subcommands/Build/CLIRunBase.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ import ContainerizationOS
import Foundation
import Testing

// This test class is not thread safe
class TestCLIRunBase: CLITest, @unchecked Sendable {
class TestCLIRunBase: CLITest {
var terminal: Terminal!
var containerName: String = UUID().uuidString

Expand Down Expand Up @@ -62,7 +61,12 @@ class TestCLIRunBase: CLITest, @unchecked Sendable {
func containerRun(stdin: [String], findMessage: String) async throws -> Bool {
let stdout = FileHandle(fileDescriptor: terminal.handle.fileDescriptor, closeOnDealloc: false)
let stdoutListenTask = Task {
try await findStdoutOutput(stdout: stdout, findMessage: findMessage)
for try await line in stdout.bytes.lines {
if line.contains(findMessage) && !line.contains("echo") {
return true
}
}
return false
}

let timeoutTask = Task {
Expand All @@ -82,15 +86,6 @@ class TestCLIRunBase: CLITest, @unchecked Sendable {
}
}

func findStdoutOutput(stdout: FileHandle, findMessage: String) async throws -> Bool {
for try await line in stdout.bytes.lines {
if line.contains(findMessage) && !line.contains("echo") {
return true
}
}
return false
}

func exec(commands: [String]) throws {
let stdin = FileHandle(fileDescriptor: terminal.handle.fileDescriptor, closeOnDealloc: false)
try commands.forEach { cmd in
Expand Down
3 changes: 1 addition & 2 deletions Tests/CLITests/Subcommands/Build/TestCLITermIO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import Foundation
import Testing

extension TestCLIRunBase {
// This test class is NOT thread safe
class TestCLITermIO: TestCLIRunBase, @unchecked Sendable {
class TestCLITermIO: TestCLIRunBase {
override var ContainerImage: String {
"ghcr.io/linuxcontainers/alpine:3.20"
}
Expand Down