diff options
Diffstat (limited to 'src/libcore/task/mod.rs')
| -rw-r--r-- | src/libcore/task/mod.rs | 20 | 
1 files changed, 10 insertions, 10 deletions
diff --git a/src/libcore/task/mod.rs b/src/libcore/task/mod.rs index 0cd78d4b847..ee454312e04 100644 --- a/src/libcore/task/mod.rs +++ b/src/libcore/task/mod.rs @@ -840,14 +840,14 @@ fn test_add_wrapper() { fn test_future_result() { let mut result = None; do task().future_result(|+r| { result = Some(r); }).spawn { } - fail_unless!(result.unwrap().recv() == Success); + assert!(result.unwrap().recv() == Success); result = None; do task().future_result(|+r| { result = Some(r); }).unlinked().spawn { fail!(); } - fail_unless!(result.unwrap().recv() == Failure); + assert!(result.unwrap().recv() == Failure); } #[test] #[should_fail] #[ignore(cfg(windows))] @@ -893,7 +893,7 @@ fn test_spawn_sched() { do spawn_sched(SingleThreaded) { let child_sched_id = unsafe { rt::rust_get_sched_id() }; - fail_unless!(parent_sched_id != child_sched_id); + assert!(parent_sched_id != child_sched_id); if (i == 0) { ch.send(()); @@ -921,8 +921,8 @@ fn test_spawn_sched_childs_on_default_sched() { do spawn { let ch = ch.f.swap_unwrap(); let child_sched_id = unsafe { rt::rust_get_sched_id() }; - fail_unless!(parent_sched_id != child_sched_id); - fail_unless!(child_sched_id == default_id); + assert!(parent_sched_id != child_sched_id); + assert!(child_sched_id == default_id); ch.send(()); }; }; @@ -1016,7 +1016,7 @@ fn avoid_copying_the_body(spawnfn: &fn(v: ~fn())) { } let x_in_child = p.recv(); - fail_unless!(x_in_parent == x_in_child); + assert!(x_in_parent == x_in_child); } #[test] @@ -1171,7 +1171,7 @@ fn test_sched_thread_per_core() { unsafe { let cores = rt::rust_num_threads(); let reported_threads = rt::rust_sched_threads(); - fail_unless!((cores as uint == reported_threads as uint)); + assert!((cores as uint == reported_threads as uint)); chan.send(()); } } @@ -1186,9 +1186,9 @@ fn test_spawn_thread_on_demand() { do spawn_sched(ManualThreads(2)) || { unsafe { let max_threads = rt::rust_sched_threads(); - fail_unless!((max_threads as int == 2)); + assert!((max_threads as int == 2)); let running_threads = rt::rust_sched_current_nonlazy_threads(); - fail_unless!((running_threads as int == 1)); + assert!((running_threads as int == 1)); let (port2, chan2) = comm::stream(); @@ -1197,7 +1197,7 @@ fn test_spawn_thread_on_demand() { } let running_threads2 = rt::rust_sched_current_nonlazy_threads(); - fail_unless!((running_threads2 as int == 2)); + assert!((running_threads2 as int == 2)); port2.recv(); chan.send(());  | 
