Skip to content

Commit

Permalink
Fix CI test for wasm32-unknown-unknown
Browse files Browse the repository at this point in the history
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
  • Loading branch information
NobodyXu committed Jul 22, 2023
1 parent c2c13d4 commit 4be9109
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 24 deletions.
5 changes: 4 additions & 1 deletion tokio/src/runtime/coop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,14 @@ mod test {
use wasm_bindgen_test::wasm_bindgen_test as test;
}

#[cfg(not(all(target_family = "wasm", not(target_os = "wasi"))))]
use std::prelude::v1::test;

fn get() -> Budget {
context::budget(|cell| cell.get()).unwrap_or(Budget::unconstrained())
}

#[test]
#[self::test]
fn budgeting() {
use futures::future::poll_fn;
use tokio_test::*;
Expand Down
9 changes: 6 additions & 3 deletions tokio/src/sync/tests/atomic_waker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ cfg_is_wasm_not_wasi! {
use wasm_bindgen_test::wasm_bindgen_test as test;
}

#[test]
#[cfg(not(all(target_family = "wasm", not(target_os = "wasi"))))]
use std::prelude::v1::test;

#[self::test]
fn basic_usage() {
let mut waker = task::spawn(AtomicWaker::new());

Expand All @@ -26,7 +29,7 @@ fn basic_usage() {
assert!(waker.is_woken());
}

#[test]
#[self::test]
fn wake_without_register() {
let mut waker = task::spawn(AtomicWaker::new());
waker.wake();
Expand All @@ -37,7 +40,7 @@ fn wake_without_register() {
assert!(!waker.is_woken());
}

#[test]
#[self::test]
#[cfg(not(target_family = "wasm"))] // wasm currently doesn't support unwinding
fn atomic_waker_panic_safe() {
use std::panic;
Expand Down
11 changes: 7 additions & 4 deletions tokio/src/sync/tests/notify.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ cfg_is_wasm_not_wasi! {
use wasm_bindgen_test::wasm_bindgen_test as test;
}

#[test]
#[cfg(not(all(target_family = "wasm", not(target_os = "wasi"))))]
use std::prelude::v1::test;

#[self::test]
fn notify_clones_waker_before_lock() {
const VTABLE: &RawWakerVTable = &RawWakerVTable::new(clone_w, wake, wake_by_ref, drop_w);

Expand Down Expand Up @@ -47,7 +50,7 @@ fn notify_clones_waker_before_lock() {
}

#[cfg(panic = "unwind")]
#[test]
#[self::test]
fn notify_waiters_handles_panicking_waker() {
use futures::task::ArcWake;

Expand Down Expand Up @@ -85,7 +88,7 @@ fn notify_waiters_handles_panicking_waker() {
}
}

#[test]
#[self::test]
fn notify_simple() {
let notify = Notify::new();

Expand All @@ -101,7 +104,7 @@ fn notify_simple() {
assert!(fut2.poll().is_ready());
}

#[test]
#[self::test]
#[cfg(not(target_family = "wasm"))]
fn watch_test() {
let rt = crate::runtime::Builder::new_current_thread()
Expand Down
35 changes: 19 additions & 16 deletions tokio/src/sync/tests/semaphore_batch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ cfg_is_wasm_not_wasi! {
use wasm_bindgen_test::wasm_bindgen_test as test;
}

#[test]
#[cfg(not(all(target_family = "wasm", not(target_os = "wasi"))))]
use std::prelude::v1::test;

#[self::test]
fn poll_acquire_one_available() {
let s = Semaphore::new(100);
assert_eq!(s.available_permits(), 100);
Expand All @@ -17,7 +20,7 @@ fn poll_acquire_one_available() {
assert_eq!(s.available_permits(), 99);
}

#[test]
#[self::test]
fn poll_acquire_many_available() {
let s = Semaphore::new(100);
assert_eq!(s.available_permits(), 100);
Expand All @@ -30,7 +33,7 @@ fn poll_acquire_many_available() {
assert_eq!(s.available_permits(), 90);
}

#[test]
#[self::test]
fn try_acquire_one_available() {
let s = Semaphore::new(100);
assert_eq!(s.available_permits(), 100);
Expand All @@ -42,7 +45,7 @@ fn try_acquire_one_available() {
assert_eq!(s.available_permits(), 98);
}

#[test]
#[self::test]
fn try_acquire_many_available() {
let s = Semaphore::new(100);
assert_eq!(s.available_permits(), 100);
Expand All @@ -54,7 +57,7 @@ fn try_acquire_many_available() {
assert_eq!(s.available_permits(), 90);
}

#[test]
#[self::test]
fn poll_acquire_one_unavailable() {
let s = Semaphore::new(1);

Expand All @@ -78,7 +81,7 @@ fn poll_acquire_one_unavailable() {
assert_eq!(s.available_permits(), 1);
}

#[test]
#[self::test]
fn poll_acquire_many_unavailable() {
let s = Semaphore::new(5);

Expand Down Expand Up @@ -115,7 +118,7 @@ fn poll_acquire_many_unavailable() {
assert_ready_ok!(acquire_3.poll());
}

#[test]
#[self::test]
fn try_acquire_one_unavailable() {
let s = Semaphore::new(1);

Expand All @@ -134,7 +137,7 @@ fn try_acquire_one_unavailable() {
assert_eq!(s.available_permits(), 1);
}

#[test]
#[self::test]
fn try_acquire_many_unavailable() {
let s = Semaphore::new(5);

Expand All @@ -156,7 +159,7 @@ fn try_acquire_many_unavailable() {
assert_eq!(s.available_permits(), 2);
}

#[test]
#[self::test]
fn poll_acquire_one_zero_permits() {
let s = Semaphore::new(0);
assert_eq!(s.available_permits(), 0);
Expand All @@ -171,19 +174,19 @@ fn poll_acquire_one_zero_permits() {
assert_ready_ok!(acquire.poll());
}

#[test]
#[self::test]
fn max_permits_doesnt_panic() {
Semaphore::new(MAX_PERMITS);
}

#[test]
#[self::test]
#[should_panic]
#[cfg(not(target_family = "wasm"))] // wasm currently doesn't support unwinding
fn validates_max_permits() {
Semaphore::new(MAX_PERMITS + 1);
}

#[test]
#[self::test]
fn close_semaphore_prevents_acquire() {
let s = Semaphore::new(5);
s.close();
Expand All @@ -197,7 +200,7 @@ fn close_semaphore_prevents_acquire() {
assert_eq!(5, s.available_permits());
}

#[test]
#[self::test]
fn close_semaphore_notifies_permit1() {
let s = Semaphore::new(0);
let mut acquire = task::spawn(s.acquire(1));
Expand All @@ -210,7 +213,7 @@ fn close_semaphore_notifies_permit1() {
assert_ready_err!(acquire.poll());
}

#[test]
#[self::test]
fn close_semaphore_notifies_permit2() {
let s = Semaphore::new(2);

Expand Down Expand Up @@ -244,7 +247,7 @@ fn close_semaphore_notifies_permit2() {
assert_eq!(2, s.available_permits());
}

#[test]
#[self::test]
fn cancel_acquire_releases_permits() {
let s = Semaphore::new(10);
s.try_acquire(4).expect("uncontended try_acquire succeeds");
Expand All @@ -260,7 +263,7 @@ fn cancel_acquire_releases_permits() {
assert_ok!(s.try_acquire(6));
}

#[test]
#[self::test]
fn release_permits_at_drop() {
use crate::sync::semaphore::*;
use futures::task::ArcWake;
Expand Down

0 comments on commit 4be9109

Please sign in to comment.