Skip to content

test(capture): decouple completion proof from frame cadence #728

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
steipete merged 1 commit into from
Sep 13, 2026
+26 −19
Merged

test(capture): decouple completion proof from frame cadence #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 8 additions & 10 deletions Apps/CLI/Sources/PeekabooCLI/Commands/Core/CaptureCommand+Action.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,10 @@ RuntimeOptionsConfigurable, InjectedRuntimeBackedCommand {
actionCompletedNs: UInt64,
captureDeadlineNs: UInt64
) async throws -> CaptureActionCaptureCompletion {
let postRollDeadlineNs = try timing.postRollDeadline(startingAtNs: actionCompletedNs)
guard postRollDeadlineNs <= captureDeadlineNs else {
throw ValidationError("Action completion left insufficient time for the requested post-roll")
}
let postRollDeadlineNs = try timing.postRollDeadline(
startingAtNs: actionCompletedNs,
captureDeadlineNs: captureDeadlineNs
)
try await Self.sleep(untilMonotonicNanoseconds: postRollDeadlineNs)
if timing.postRollMs > 0 {
session.requestStop(afterSampleStartedAtOrAfter: actionCompletedNs)
Expand Down Expand Up @@ -1037,17 +1037,15 @@ struct CaptureActionTiming {
return captureDeadlineNs - postRollNs
}

func postRollFits(startingAtNs: UInt64, captureDeadlineNs: UInt64) -> Bool {
guard let deadlineNs = try? self.postRollDeadline(startingAtNs: startingAtNs) else { return false }
return deadlineNs <= captureDeadlineNs
}

func postRollDeadline(startingAtNs: UInt64) throws -> UInt64 {
func postRollDeadline(startingAtNs: UInt64, captureDeadlineNs: UInt64) throws -> UInt64 {
let postRollNs = try Self.nanoseconds(milliseconds: self.postRollMs)
let (deadlineNs, overflowed) = startingAtNs.addingReportingOverflow(postRollNs)
guard !overflowed else {
throw ValidationError("--post-roll overflowed the capture deadline")
}
guard deadlineNs <= captureDeadlineNs else {
throw ValidationError("Action completion left insufficient time for the requested post-roll")
}
return deadlineNs
}

Expand Down
27 changes: 18 additions & 9 deletions Apps/CLI/Tests/CoreCLITests/CaptureActionCommandEndToEndTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,7 @@ extension CaptureActionCommandEndToEndTests {
)
defer { try? FileManager.default.removeItem(at: outputDirectory) }
let processStartIdentity = try #require(SystemIdentityResolver.processStartIdentity(getpid()))
var runnerReturnedAfterDeadline = false
var command = CaptureActionCommand()
command.mode = "frontmost"
command.durationLimit = CLIDuration(argument: "2500ms")
Expand All @@ -955,12 +956,14 @@ extension CaptureActionCommandEndToEndTests {
deadlineProcessRunner: { childCommand, timeoutSeconds, completionDeadlineNs, onLaunch in
let actionStartedNs = DispatchTime.now().uptimeNanoseconds
onLaunch(actionStartedNs)
let completedAtNs = completionDeadlineNs - 50_000_000
// Keep sampling headroom independent of the delayed delivery being tested.
let completedAtNs = actionStartedNs
let delayedReturnNs = completionDeadlineNs + 20_000_000
let nowNs = DispatchTime.now().uptimeNanoseconds
if delayedReturnNs > nowNs {
try await Task.sleep(nanoseconds: delayedReturnNs - nowNs)
}
runnerReturnedAfterDeadline = DispatchTime.now().uptimeNanoseconds > completionDeadlineNs
return CaptureActionProcessResult(
command: childCommand,
processIdentifier: getpid(),
Expand Down Expand Up @@ -988,7 +991,10 @@ extension CaptureActionCommandEndToEndTests {
from: Data(contentsOf: URL(fileURLWithPath: receipt.path))
)

#expect(runnerReturnedAfterDeadline)
#expect(result.success)
#expect(manifest.timeline.actionCompletedMs == manifest.timeline.actionStartedMs)
#expect(manifest.provesPostActionSample)
#expect(manifest.timeline.samplingCompletedMs >= manifest.timeline.actionCompletedMs + 100)
}

Expand Down Expand Up @@ -1138,14 +1144,17 @@ extension CaptureActionCommandEndToEndTests {
captureDeadlineNs: captureDeadlineNs
)
#expect(actionCompletionDeadlineNs == captureStartedNs + 2_300_000_000)
#expect(timing.postRollFits(
startingAtNs: actionCompletionDeadlineNs,
captureDeadlineNs: captureDeadlineNs
))
#expect(!timing.postRollFits(
startingAtNs: actionCompletionDeadlineNs + 1,
captureDeadlineNs: captureDeadlineNs
))
for start in [actionCompletionDeadlineNs - 50_000_000, actionCompletionDeadlineNs] {
#expect(try timing.postRollDeadline(
startingAtNs: start,
captureDeadlineNs: captureDeadlineNs
) == start + 200_000_000)
}
for start in [actionCompletionDeadlineNs + 1, actionCompletionDeadlineNs + 20_000_000, UInt64.max] {
#expect(throws: (any Error).self) {
try timing.postRollDeadline(startingAtNs: start, captureDeadlineNs: captureDeadlineNs)
}
}
#expect(throws: (any Error).self) {
_ = try CaptureActionTiming.resolve(
durationLimit: 1.7,
Expand Down