Skip to content

Commit e0a7bc6

Browse files
flaky test fixed
1 parent a875f18 commit e0a7bc6

1 file changed

Lines changed: 8 additions & 11 deletions

File tree

substrate/client/transaction-pool/src/fork_aware_txpool/import_notification_sink.rs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ mod tests {
326326
let j0 = tokio::spawn(runnable);
327327

328328
let stream = ctrl.event_stream();
329+
let stream2 = ctrl.event_stream();
329330

330331
let mut v1 = View::new(vec![(10, 1), (10, 2), (10, 3)]);
331332
let mut v2 = View::new(vec![(20, 1), (20, 2), (20, 6)]);
@@ -342,20 +343,16 @@ mod tests {
342343
ctrl.add_view(1000, o1);
343344
ctrl.add_view(2000, o2);
344345

345-
let j4 = {
346-
let ctrl = ctrl.clone();
347-
tokio::spawn(async move {
348-
tokio::time::sleep(Duration::from_millis(70)).await;
349-
ctrl.clean_notified_items(&vec![1, 3]);
350-
ctrl.add_view(3000, o3.boxed());
351-
})
352-
};
346+
let out = stream.take(4).collect::<Vec<_>>().await;
347+
assert_eq!(out, vec![1, 2, 3, 6]);
353348

354-
let out = stream.take(6).collect::<Vec<_>>().await;
349+
ctrl.clean_notified_items(&vec![1, 3]);
350+
ctrl.add_view(3000, o3.boxed());
351+
let out = stream2.take(6).collect::<Vec<_>>().await;
355352
assert_eq!(out, vec![1, 2, 3, 6, 1, 3]);
356-
drop(ctrl);
357353

358-
futures::future::join_all(vec![j0, j1, j2, j3, j4]).await;
354+
drop(ctrl);
355+
futures::future::join_all(vec![j0, j1, j2, j3]).await;
359356
}
360357

361358
#[tokio::test]

0 commit comments

Comments
 (0)