Skip to content

fix(moq-ffi): unblock deadlocking dynamic_track_request tests #1712

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
kixelated merged 1 commit into from
Jun 13, 2026
Merged

fix(moq-ffi): unblock deadlocking dynamic_track_request tests #1712

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
26 changes: 16 additions & 10 deletions rs/moq-ffi/src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,15 @@ async fn dynamic_track_request() {
let broadcast = MoqBroadcastProducer::new().unwrap();
let dynamic = broadcast.dynamic().unwrap();
let consumer = broadcast.consume().unwrap();
let track_consumer = consumer.subscribe_track("events".into()).await.unwrap();

let track = tokio::time::timeout(TIMEOUT, dynamic.requested_track())
.await
.expect("timed out waiting for requested track")
.unwrap();
// subscribe_track stays pending until the dynamic producer accepts the request
// via requested_track(), so drive both sides concurrently to avoid a deadlock.
let (track_consumer, track) = tokio::join!(
consumer.subscribe_track("events".into()),
tokio::time::timeout(TIMEOUT, dynamic.requested_track()),
);
let track_consumer = track_consumer.unwrap();
let track = track.expect("timed out waiting for requested track").unwrap();

assert_eq!(track.name().unwrap(), "events");

Expand All @@ -103,12 +106,15 @@ async fn dynamic_track_request_can_abort() {
let broadcast = MoqBroadcastProducer::new().unwrap();
let dynamic = broadcast.dynamic().unwrap();
let consumer = broadcast.consume().unwrap();
let _track_consumer = consumer.subscribe_track("unknown".into()).await.unwrap();

let track = tokio::time::timeout(TIMEOUT, dynamic.requested_track())
.await
.expect("timed out waiting for requested track")
.unwrap();
// subscribe_track stays pending until the dynamic producer accepts the request
// via requested_track(), so drive both sides concurrently to avoid a deadlock.
let (track_consumer, track) = tokio::join!(
consumer.subscribe_track("unknown".into()),
tokio::time::timeout(TIMEOUT, dynamic.requested_track()),
);
let _track_consumer = track_consumer.unwrap();
let track = track.expect("timed out waiting for requested track").unwrap();

track.abort(404).unwrap();
assert!(matches!(track.name(), Err(MoqError::Closed)));
Expand Down
Loading