diff --git a/src/docbuilder/rustwide_builder.rs b/src/docbuilder/rustwide_builder.rs index 2aeda4c2a..77d7e3829 100644 --- a/src/docbuilder/rustwide_builder.rs +++ b/src/docbuilder/rustwide_builder.rs @@ -2097,7 +2097,7 @@ mod tests { #[test] #[ignore] - fn test_additional_targets() { + fn test_additional_targets() -> Result<()> { fn assert_contains(targets: &[String], target: &str) { assert!( targets.iter().any(|t| t == target), @@ -2105,19 +2105,21 @@ mod tests { ); } - wrapper(|env| { - let mut builder = RustwideBuilder::init(env)?; - builder.update_toolchain()?; - assert!( - builder - .build_local_package(Path::new("tests/crates/additional-targets"))? - .successful - ); + let env = TestEnvironment::new_with_runtime()?; - let row = env.runtime().block_on(async { - let mut conn = env.async_db().await.async_conn().await; - sqlx::query!( - r#"SELECT + let mut builder = RustwideBuilder::init(&env.context)?; + builder.update_toolchain()?; + + assert!( + builder + .build_local_package(Path::new("tests/crates/additional-targets"))? + .successful + ); + + let row = env.runtime().block_on(async { + let mut conn = env.async_db().async_conn().await; + sqlx::query!( + r#"SELECT r.doc_targets FROM crates as c @@ -2125,27 +2127,26 @@ mod tests { WHERE c.name = $1 AND r.version = $2"#, - "additional-targets", - "0.1.0", - ) - .fetch_one(&mut *conn) - .await - })?; + "additional-targets", + "0.1.0", + ) + .fetch_one(&mut *conn) + .await + })?; - let targets: Vec = row - .doc_targets - .unwrap() - .as_array() - .unwrap() - .iter() - .map(|v| v.as_str().unwrap().to_owned()) - .collect(); + let targets: Vec = row + .doc_targets + .unwrap() + .as_array() + .unwrap() + .iter() + .map(|v| v.as_str().unwrap().to_owned()) + .collect(); - assert_contains(&targets, "x86_64-apple-darwin"); - // Part of the default targets. - assert_contains(&targets, "aarch64-apple-darwin"); + assert_contains(&targets, "x86_64-apple-darwin"); + // Part of the default targets. + assert_contains(&targets, "aarch64-apple-darwin"); - Ok(()) - }) + Ok(()) } }