Skip to content

Implement returning Result from test functions. #10

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

Open
daxpedda wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Implement returning Result from test functions. #10

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 60 additions & 13 deletions src/fork_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,52 @@ macro_rules! rusty_fork_test {
(#![rusty_fork(timeout_ms = $timeout:expr)]
$(
$(#[$meta:meta])*
fn $test_name:ident() $body:block
fn $test_name:ident()$( -> $ret:ty)? $body:block
)*) => { $(
$crate::rusty_fork_test_ret!($timeout, [$($meta)*], $test_name, $body$(, $ret)?);
)* };

($(
$(#[$meta:meta])*
fn $test_name:ident()$( -> $ret:ty)? $body:block
)*) => {
$crate::rusty_fork_test! {
#![rusty_fork(timeout_ms = 0)]

$($(#[$meta])* fn $test_name()$( -> $ret)? $body)*
}
};
}

#[doc(hidden)]
#[macro_export]
macro_rules! rusty_fork_test_ret {
($timeout:expr, [$($meta:meta)*], $test_name:ident, $body:block) => {
$crate::rusty_fork_test_inner!($timeout, [$($meta)*], $test_name, fn body_fn() $body);
};

($timeout:expr, [$($meta:meta)*], $test_name:ident, $body:block, $ret:ty) => {
$crate::rusty_fork_test_inner!(
$timeout,
[$($meta)*],
$test_name,
fn body_fn() {
fn body_fn() -> $ret $body
body_fn().unwrap();
}
);
};
}

#[doc(hidden)]
#[macro_export]
macro_rules! rusty_fork_test_inner {
($timeout:expr, [$($meta:meta)*], $test_name:ident, $body_fn:stmt) => {
$(#[$meta])*
fn $test_name() {
// Eagerly convert everything to function pointers so that all
// tests use the same instantiation of `fork`.
fn body_fn() $body
$body_fn
let body: fn () = body_fn;

fn supervise_fn(child: &mut $crate::ChildWrapper,
Expand All @@ -95,17 +134,6 @@ macro_rules! rusty_fork_test {
$crate::fork_test::no_configure_child,
supervise, body).expect("forking test failed")
}
)* };

($(
$(#[$meta:meta])*
fn $test_name:ident() $body:block
)*) => {
rusty_fork_test! {
#![rusty_fork(timeout_ms = 0)]

$($(#[$meta])* fn $test_name() $body)*
}
};
}

Expand Down Expand Up @@ -170,6 +198,8 @@ fn wait_timeout(_: &mut ChildWrapper, _: u64) {

#[cfg(test)]
mod test {
use std::io::Result;

rusty_fork_test! {
#[test]
fn trivial() { }
Expand All @@ -185,6 +215,23 @@ mod test {
fn aborting_child() {
::std::process::abort();
}

#[test]
fn trivial_result() -> Result<()> {
Ok(())
}

#[test]
#[should_panic]
fn panicking_child_result() -> Result<()> {
panic!("just testing a panic, nothing to see here");
}

#[test]
#[should_panic]
fn aborting_child_result() -> Result<()> {
::std::process::abort();
}
}

rusty_fork_test! {
Expand Down