Skip to content

test: scale the SSH retry-budget test's process deadline with its attempt count #14068

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

Closed
teamleaderleo wants to merge 2 commits into from
Closed

test: scale the SSH retry-budget test's process deadline with its attempt count #14068

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2126d9
test: scale the SSH retry-budget harness deadline with its attempts
teamleaderleo Sep 23, 2026
b7ea132
Merge branch 'main' into fix-ssh-reattach-retry-timeout
teamleaderleo Sep 24, 2026
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
15 changes: 12 additions & 3 deletions cmuxTests/SSHDeepSleepReattachTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,12 @@ struct SSHDeepSleepReattachTests {
sessionID: "ssh-test-session",
foregroundAuth: Self.foregroundAuth()
).replacingOccurrences(of: "/usr/bin/ssh", with: fakeSSH.path),
environment: environment
environment: environment,
// Every attach attempt spawns uuidgen, the fake ssh, cmux and
// sleep, so the full budget costs ~4.5 s on an idle runner and
// more under shard load. The deadline only bounds a hang; it
// scales with the attempts the case expects to run.
timeout: max(5, Double(expectedSleepCount + 1) * 2)
)

#expect(!result.timedOut, Comment(rawValue: result.stderr))
Expand Down Expand Up @@ -527,7 +532,11 @@ struct SSHDeepSleepReattachTests {
try (lines.joined(separator: "\n") + "\n").write(to: url, atomically: true, encoding: .utf8)
}

private static func runProcess(command: String, environment: [String: String]) -> ProcessRunResult {
private static func runProcess(
command: String,
environment: [String: String],
timeout: TimeInterval = 5
) -> ProcessRunResult {
let process = Process()
let stderrPipe = Pipe()
process.executableURL = URL(fileURLWithPath: "/bin/sh")
Expand All @@ -546,7 +555,7 @@ struct SSHDeepSleepReattachTests {
process.waitUntilExit()
exitSignal.signal()
}
let timedOut = exitSignal.wait(timeout: .now() + 5) == .timedOut
let timedOut = exitSignal.wait(timeout: .now() + timeout) == .timedOut
if timedOut {
process.terminate()
_ = exitSignal.wait(timeout: .now() + 1)
Expand Down
Loading