Skip to content
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

Jump to bottom

rt: improve rng_seed test robustness #5075

Merged
merged 1 commit into from Oct 5, 2022
Merged

rt: improve rng_seed test robustness #5075

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 21 additions & 17 deletions tokio/tests/macros_select.rs
View file
Open in desktop
Expand Up @@ -607,40 +607,44 @@ mod unstable {
#[test]
fn deterministic_select_current_thread() {
let seed = b"bytes used to generate seed";
let rt = tokio::runtime::Builder::new_current_thread()
let rt1 = tokio::runtime::Builder::new_current_thread()
.rng_seed(RngSeed::from_bytes(seed))
.build()
.unwrap();
let rt1_values = rt1.block_on(async { (select_0_to_9().await, select_0_to_9().await) });

rt.block_on(async {
let num = select_0_to_9().await;
assert_eq!(num, 5);
let rt2 = tokio::runtime::Builder::new_current_thread()
.rng_seed(RngSeed::from_bytes(seed))
.build()
.unwrap();
let rt2_values = rt2.block_on(async { (select_0_to_9().await, select_0_to_9().await) });

let num = select_0_to_9().await;
assert_eq!(num, 1);
});
assert_eq!(rt1_values, rt2_values);
}

#[test]
#[cfg(all(feature = "rt-multi-thread", not(tokio_wasi)))]
fn deterministic_select_multi_thread() {
let seed = b"bytes used to generate seed";
let rt = tokio::runtime::Builder::new_multi_thread()
let rt1 = tokio::runtime::Builder::new_multi_thread()
.worker_threads(1)
.rng_seed(RngSeed::from_bytes(seed))
.build()
.unwrap();
let rt1_values = rt1.block_on(async {
let _ = tokio::spawn(async { (select_0_to_9().await, select_0_to_9().await) }).await;
});

rt.block_on(async {
let _ = tokio::spawn(async {
let num = select_0_to_9().await;
assert_eq!(num, 6);

let num = select_0_to_9().await;
assert_eq!(num, 9);
})
.await;
let rt2 = tokio::runtime::Builder::new_multi_thread()
.worker_threads(1)
.rng_seed(RngSeed::from_bytes(seed))
.build()
.unwrap();
let rt2_values = rt2.block_on(async {
let _ = tokio::spawn(async { (select_0_to_9().await, select_0_to_9().await) }).await;
});

assert_eq!(rt1_values, rt2_values);
}

async fn select_0_to_9() -> u32 {
Expand Down
57 changes: 36 additions & 21 deletions tokio/tests/rt_basic.rs
View file
Open in desktop
Expand Up @@ -385,43 +385,58 @@ mod unstable {
#[test]
fn rng_seed() {
let seed = b"bytes used to generate seed";
let rt = tokio::runtime::Builder::new_current_thread()
let rt1 = tokio::runtime::Builder::new_current_thread()
.rng_seed(RngSeed::from_bytes(seed))
.build()
.unwrap();
let rt1_values = rt1.block_on(async {
let rand_1 = tokio::macros::support::thread_rng_n(100);
let rand_2 = tokio::macros::support::thread_rng_n(100);

rt.block_on(async {
let random = tokio::macros::support::thread_rng_n(100);
assert_eq!(random, 59);
(rand_1, rand_2)
});

let rt2 = tokio::runtime::Builder::new_current_thread()
.rng_seed(RngSeed::from_bytes(seed))
.build()
.unwrap();
let rt2_values = rt2.block_on(async {
let rand_1 = tokio::macros::support::thread_rng_n(100);
let rand_2 = tokio::macros::support::thread_rng_n(100);

let random = tokio::macros::support::thread_rng_n(100);
assert_eq!(random, 10);
(rand_1, rand_2)
});

assert_eq!(rt1_values, rt2_values);
}

#[test]
fn rng_seed_multi_enter() {
let seed = b"bytes used to generate seed";
let rt = tokio::runtime::Builder::new_current_thread()

fn two_rand_values() -> (u32, u32) {
let rand_1 = tokio::macros::support::thread_rng_n(100);
let rand_2 = tokio::macros::support::thread_rng_n(100);

(rand_1, rand_2)
}

let rt1 = tokio::runtime::Builder::new_current_thread()
.rng_seed(RngSeed::from_bytes(seed))
.build()
.unwrap();
let rt1_values_1 = rt1.block_on(async { two_rand_values() });
let rt1_values_2 = rt1.block_on(async { two_rand_values() });

rt.block_on(async {
let random = tokio::macros::support::thread_rng_n(100);
assert_eq!(random, 59);

let random = tokio::macros::support::thread_rng_n(100);
assert_eq!(random, 10);
});

rt.block_on(async {
let random = tokio::macros::support::thread_rng_n(100);
assert_eq!(random, 86);
let rt2 = tokio::runtime::Builder::new_current_thread()
.rng_seed(RngSeed::from_bytes(seed))
.build()
.unwrap();
let rt2_values_1 = rt2.block_on(async { two_rand_values() });
let rt2_values_2 = rt2.block_on(async { two_rand_values() });

let random = tokio::macros::support::thread_rng_n(100);
assert_eq!(random, 1);
});
assert_eq!(rt1_values_1, rt2_values_1);
assert_eq!(rt1_values_2, rt2_values_2);
}
}

Expand Down
25 changes: 21 additions & 4 deletions tokio/tests/rt_threaded.rs
View file
Open in desktop
Expand Up @@ -566,23 +566,40 @@ mod unstable {
#[test]
fn rng_seed() {
let seed = b"bytes used to generate seed";
let rt = tokio::runtime::Builder::new_multi_thread()
let rt1 = tokio::runtime::Builder::new_multi_thread()
.worker_threads(1)
.rng_seed(RngSeed::from_bytes(seed))
.build()
.unwrap();
let rt1_value = rt1.block_on(async {
let random = tokio::macros::support::thread_rng_n(100);
assert_eq!(random, 86);

rt.block_on(async {
let _ = tokio::spawn(async {
// Because we only have a single worker thread, the
// RNG will be deterministic here as well.
tokio::macros::support::thread_rng_n(100);
})
.await;
});

let rt2 = tokio::runtime::Builder::new_multi_thread()
.worker_threads(1)
.rng_seed(RngSeed::from_bytes(seed))
.build()
.unwrap();
let rt2_value = rt2.block_on(async {
let random = tokio::macros::support::thread_rng_n(100);
assert_eq!(random, 86);

let _ = tokio::spawn(async {
// Because we only have a single worker thread, the
// RNG will be deterministic here as well.
let random = tokio::macros::support::thread_rng_n(100);
assert_eq!(random, 64);
tokio::macros::support::thread_rng_n(100);
})
.await;
});

assert_eq!(rt1_value, rt2_value);
}
}