mirror of
https://github.com/tokio-rs/tokio.git
synced 2025-09-25 12:00:35 +00:00
signal: remove oneshot channels from tests (#7015)
This commit is contained in:
parent
e0d1293fac
commit
405d746d38
@ -9,23 +9,15 @@ mod support {
|
||||
use support::signal::send_signal;
|
||||
|
||||
use tokio::signal;
|
||||
use tokio::sync::oneshot;
|
||||
use tokio_test::assert_ok;
|
||||
|
||||
#[tokio::test]
|
||||
async fn ctrl_c() {
|
||||
let ctrl_c = signal::ctrl_c();
|
||||
|
||||
let (fire, wait) = oneshot::channel();
|
||||
|
||||
// NB: simulate a signal coming in by exercising our signal handler
|
||||
// to avoid complications with sending SIGINT to the test process
|
||||
tokio::spawn(async {
|
||||
wait.await.expect("wait failed");
|
||||
send_signal(libc::SIGINT);
|
||||
});
|
||||
|
||||
let _ = fire.send(());
|
||||
|
||||
assert_ok!(ctrl_c.await);
|
||||
}
|
||||
|
@ -17,24 +17,16 @@ use support::signal::send_signal;
|
||||
|
||||
use tokio::signal;
|
||||
use tokio::signal::unix::SignalKind;
|
||||
use tokio::sync::oneshot;
|
||||
use tokio::time::{timeout, Duration};
|
||||
|
||||
#[tokio::test]
|
||||
async fn siginfo() {
|
||||
let mut sig = signal::unix::signal(SignalKind::info()).expect("installed signal handler");
|
||||
|
||||
let (fire, wait) = oneshot::channel();
|
||||
|
||||
// NB: simulate a signal coming in by exercising our signal handler
|
||||
// to avoid complications with sending SIGINFO to the test process
|
||||
tokio::spawn(async {
|
||||
wait.await.expect("wait failed");
|
||||
send_signal(libc::SIGINFO);
|
||||
});
|
||||
|
||||
let _ = fire.send(());
|
||||
|
||||
// Add a timeout to ensure the test doesn't hang.
|
||||
timeout(Duration::from_secs(5), sig.recv())
|
||||
.await
|
||||
|
Loading…
x
Reference in New Issue
Block a user