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

Fix async test functions inside a serial mod block #111

Merged
merged 2 commits into from
Apr 27, 2024
Merged

Fix async test functions inside a serial mod block #111

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c25842
Fix async test functions inside a serial mod block
palfrey Apr 27, 2024
2cb0880
Only test async with mod when async is on
palfrey Apr 27, 2024
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
65 changes: 56 additions & 9 deletions serial_test_derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,9 @@ fn core_setup(
.contains("test")
}) =>
{
syn::parse2(fn_setup(item_fn, config, prefix, kind)).unwrap()
let tokens = fn_setup(item_fn, config, prefix, kind);
let token_display = format!("tokens: {tokens}");
syn::parse2(tokens).expect(&token_display)
}
other => other,
})
Expand Down Expand Up @@ -405,12 +407,12 @@ fn fn_setup(
let fnname = format_ident!("{}_async_{}_core_with_return", prefix, kind);
let temp_fn = format_ident!("_{}_internal", name);
quote! {
async fn #temp_fn () -> #ret
#block

#(#attrs)
*
#vis async fn #name () -> #ret {
async fn #temp_fn () -> #ret
#block

#print_name
serial_test::#fnname(vec![#(#names ),*], #path, #temp_fn()).await
}
Expand All @@ -434,12 +436,12 @@ fn fn_setup(
let fnname = format_ident!("{}_async_{}_core", prefix, kind);
let temp_fn = format_ident!("_{}_internal", name);
quote! {
async fn #temp_fn ()
#block

#(#attrs)
*
#vis async fn #name () {
async fn #temp_fn ()
#block

#print_name
serial_test::#fnname(vec![#(#names ),*], #path, #temp_fn()).await;
}
Expand Down Expand Up @@ -573,8 +575,8 @@ mod tests {
};
let stream = local_serial_core(attrs.into(), input);
let compare = quote! {
async fn _foo_internal () { }
async fn foo () {
async fn _foo_internal () { }
serial_test::local_async_serial_core(vec![""], ::std::option::Option::None, _foo_internal() ).await;
}
};
Expand All @@ -591,8 +593,8 @@ mod tests {
};
let stream = local_serial_core(attrs.into(), input);
let compare = quote! {
async fn _foo_internal () -> Result<(), ()> { Ok(()) }
async fn foo () -> Result<(), ()> {
async fn _foo_internal () -> Result<(), ()> { Ok(()) }
serial_test::local_async_serial_core_with_return(vec![""], ::std::option::Option::None, _foo_internal() ).await
}
};
Expand Down Expand Up @@ -775,4 +777,49 @@ mod tests {
};
compare_streams(compare, stream);
}

#[test]
#[cfg(feature = "async")]
fn test_mod_with_async() {
init();
let attrs = proc_macro2::TokenStream::new();
let input = quote! {
#[cfg(test)]
#[serial]
mod serial_attr_tests {
#[demo_library::test]
async fn foo() -> Result<(), ()> {
Ok(())
}

#[demo_library::test]
#[ignore = "bla"]
async fn bar() -> Result<(), ()> {
Ok(())
}
}
};
let stream = local_serial_core(
proc_macro2::TokenStream::from_iter(attrs.into_iter()),
input,
);
let compare = quote! {
#[cfg(test)]
mod serial_attr_tests {
#[demo_library::test]
async fn foo() -> Result<(), ()> {
async fn _foo_internal() -> Result<(), ()> { Ok(())}
serial_test::local_async_serial_core_with_return(vec![""], ::std::option::Option::None, _foo_internal() ).await
}

#[demo_library::test]
#[ignore = "bla"]
async fn bar() -> Result<(), ()> {
async fn _bar_internal() -> Result<(), ()> { Ok(())}
serial_test::local_async_serial_core_with_return(vec![""], ::std::option::Option::None, _bar_internal() ).await
}
}
};
compare_streams(compare, stream);
}
}
Loading