Skip to content

simplex tests: a file is overdue counted from its forward, however long that took #799

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
futurepaul merged 1 commit into from
Oct 31, 2026
Merged

simplex tests: a file is overdue counted from its forward, however long that took #799

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
17 changes: 12 additions & 5 deletions images/bridge/src/simplex/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2230,7 +2230,7 @@ mod tests {
let p8 = posts.try_recv().expect("8 posted");
assert!(p8.inbound.item == 8 && p8.file.is_some() && p8.note.is_none());
// 7 never does: cancelled at the core, posted once with a note
m.files_overdue(t0 + Duration::from_millis(FILE_WAIT_MS + 1_000));
m.files_overdue(all_overdue(t0));
assert!(m.slots[f].files.is_empty());
assert_eq!(cmds(&mut sent), ["/fcancel 7"]);
let p7 = posts.try_recv().expect("7 posted");
Expand Down Expand Up @@ -2269,6 +2269,13 @@ mod tests {
Inbound { id: format!("m{item}"), kind: "voice".into(), text: String::new(), at: "2026-10-25T17:00:00Z".into(), item, file: Some(wire::FileRef { id: item, name: "voice.m4a".into(), size: 9_000, path: path.map(str::to_string) }) }
}

/// An instant past `FILE_WAIT_MS` for every file forwarded so far, and
/// no earlier than `after`: a file's wait counts from its forward, on
/// the real clock, however long the forwards took (a write each).
fn all_overdue(after: Instant) -> Instant {
after.max(Instant::now()) + Duration::from_millis(FILE_WAIT_MS)
}

/// The core's commands sent so far: (corrId, line).
fn sent_lines(sent: &mut mpsc::Receiver<String>) -> Vec<(String, String)> {
std::iter::from_fn(|| sent.try_recv().ok())
Expand Down Expand Up @@ -2421,7 +2428,7 @@ mod tests {
// given up on, then done anyway: deleted; its catch-up posts the note
let t0 = Instant::now();
m.forward(f, voice(7, None));
m.files_overdue(t0 + Duration::from_millis(FILE_WAIT_MS + 1_000));
m.files_overdue(all_overdue(t0));
assert!(posts.try_recv().is_ok_and(|p| p.inbound.item == 7 && p.note.is_some()));
std::fs::write(files.join("voice_7.m4a"), b"late").expect("a file");
m.file_event(f, &Resp::FileDone { file: 7, path: "voice_7.m4a".into() });
Expand Down Expand Up @@ -2669,7 +2676,7 @@ mod tests {
drop(sent_lines(&mut sent));
let core = m.slots.get_mut(f).expect("its slot").core.take();
m.slots.get_mut(f).expect("its slot").up = false;
t += Duration::from_millis(FILE_WAIT_MS + 1_000);
t = all_overdue(t);
m.files_overdue(t);
assert!(posts.try_recv().is_ok_and(|p| p.inbound.item == 7 && p.note.is_some()), "its note, once");
assert_eq!(m.slots[f].saved.abandoned.get(&7), Some(&Abandoned::Cancelling));
Expand Down Expand Up @@ -2732,7 +2739,7 @@ mod tests {
for id in &batch {
m.forward(f, voice(*id, None));
}
t += Duration::from_millis(FILE_WAIT_MS + 1_000);
t = all_overdue(t);
m.files_overdue(t);
for (corr, line) in sent_lines(&mut sent) {
if line.starts_with("/fcancel") {
Expand Down Expand Up @@ -2790,7 +2797,7 @@ mod tests {
for id in &batch {
m.forward(f, voice(*id, None));
}
t += Duration::from_millis(FILE_WAIT_MS + 1_000);
t = all_overdue(t);
m.files_overdue(t);
for (corr, line) in sent_lines(&mut sent) {
if line.starts_with("/fcancel") {
Expand Down
Loading