test: standardize test crate path resolution using CARGO_MANIFEST_DIR

Author: messense

src/build_options.rs

@@ -153,6 +153,7 @@ mod tests {
     use super::*;
     use crate::bridge::{Abi3Version, PyO3, PyO3Crate, find_bridge};
     use crate::python_interpreter::InterpreterResolver;
+    use crate::test_utils::test_crate_path;
     use crate::{BridgeModel, Target};
     use cargo_metadata::MetadataCommand;
     use insta::assert_snapshot;
@@ -162,7 +163,7 @@ mod tests {
     #[test]
     fn test_find_bridge_pyo3() {
         let pyo3_mixed = MetadataCommand::new()
-            .manifest_path(Path::new("test-crates/pyo3-mixed").join("Cargo.toml"))
+            .manifest_path(test_crate_path("pyo3-mixed").join("Cargo.toml"))
             .exec()
             .unwrap();
 
@@ -181,7 +182,7 @@ mod tests {
         use crate::bridge::{PyO3Metadata, PyO3VersionMetadata};
 
         let pyo3_pure = MetadataCommand::new()
-            .manifest_path(Path::new("test-crates/pyo3-pure").join("Cargo.toml"))
+            .manifest_path(test_crate_path("pyo3-pure").join("Cargo.toml"))
             .exec()
             .unwrap();
 
@@ -207,14 +208,14 @@ mod tests {
     #[test]
     fn test_find_bridge_pyo3_feature() {
         let pyo3_pure = MetadataCommand::new()
-            .manifest_path(Path::new("test-crates/pyo3-feature").join("Cargo.toml"))
+            .manifest_path(test_crate_path("pyo3-feature").join("Cargo.toml"))
             .exec()
             .unwrap();
 
         assert!(find_bridge(&pyo3_pure, None, None).is_err());
 
         let pyo3_pure = MetadataCommand::new()
-            .manifest_path(Path::new("test-crates/pyo3-feature").join("Cargo.toml"))
+            .manifest_path(test_crate_path("pyo3-feature").join("Cargo.toml"))
             .other_options(vec!["--features=pyo3".to_string()])
             .exec()
             .unwrap();
@@ -228,7 +229,7 @@ mod tests {
     #[test]
     fn test_find_bridge_cffi() {
         let cffi_pure = MetadataCommand::new()
-            .manifest_path(Path::new("test-crates/cffi-pure").join("Cargo.toml"))
+            .manifest_path(test_crate_path("cffi-pure").join("Cargo.toml"))
             .exec()
             .unwrap();
 
@@ -247,7 +248,7 @@ mod tests {
     #[test]
     fn test_find_bridge_bin() {
         let hello_world = MetadataCommand::new()
-            .manifest_path(Path::new("test-crates/hello-world").join("Cargo.toml"))
+            .manifest_path(test_crate_path("hello-world").join("Cargo.toml"))
             .exec()
             .unwrap();
 
@@ -263,7 +264,7 @@ mod tests {
         assert!(find_bridge(&hello_world, Some("pyo3"), None).is_err());
 
         let pyo3_bin = MetadataCommand::new()
-            .manifest_path(Path::new("test-crates/pyo3-bin").join("Cargo.toml"))
+            .manifest_path(test_crate_path("pyo3-bin").join("Cargo.toml"))
             .exec()
             .unwrap();
         assert!(matches!(

src/lib.rs

@@ -78,6 +78,8 @@ mod python_interpreter;
 mod sbom;
 mod source_distribution;
 mod target;
+#[cfg(test)]
+mod test_utils;
 #[cfg(feature = "upload")]
 mod upload;
 pub(crate) mod util;

src/metadata.rs

@@ -842,6 +842,7 @@ fn fold_header(text: &str) -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::test_utils::test_crate_path;
     use cargo_metadata::MetadataCommand;
     use expect_test::{Expect, expect};
     use indoc::indoc;
@@ -966,7 +967,7 @@ A test project
 
     #[test]
     fn test_merge_metadata_from_pyproject_toml() {
-        let manifest_dir = PathBuf::from("test-crates").join("pyo3-pure");
+        let manifest_dir = test_crate_path("pyo3-pure");
         let cargo_metadata = MetadataCommand::new()
             .manifest_path(manifest_dir.join("Cargo.toml"))
             .exec()
@@ -982,7 +983,7 @@ A test project
         );
         assert_eq!(
             metadata.description,
-            Some(fs_err::read_to_string("test-crates/pyo3-pure/README.md").unwrap())
+            Some(fs_err::read_to_string(manifest_dir.join("README.md")).unwrap())
         );
         assert_eq!(metadata.classifiers, &["Programming Language :: Rust"]);
         assert_eq!(
@@ -1015,7 +1016,7 @@ A test project
 
     #[test]
     fn test_merge_metadata_from_pyproject_toml_with_customized_python_source_dir() {
-        let manifest_dir = PathBuf::from("test-crates").join("pyo3-mixed-py-subdir");
+        let manifest_dir = test_crate_path("pyo3-mixed-py-subdir");
         let cargo_metadata = MetadataCommand::new()
             .manifest_path(manifest_dir.join("Cargo.toml"))
             .exec()
@@ -1036,7 +1037,7 @@ A test project
 
     #[test]
     fn test_implicit_readme() {
-        let manifest_dir = PathBuf::from("test-crates").join("pyo3-mixed");
+        let manifest_dir = test_crate_path("pyo3-mixed");
         let cargo_metadata = MetadataCommand::new()
             .manifest_path(manifest_dir.join("Cargo.toml"))
             .exec()
@@ -1051,7 +1052,7 @@ A test project
 
     #[test]
     fn test_pep639() {
-        let manifest_dir = PathBuf::from("test-crates").join("pyo3-mixed");
+        let manifest_dir = test_crate_path("pyo3-mixed");
         let cargo_metadata = MetadataCommand::new()
             .manifest_path(manifest_dir.join("Cargo.toml"))
             .exec()
@@ -1068,7 +1069,7 @@ A test project
 
     #[test]
     fn test_merge_metadata_from_pyproject_dynamic_license_test() {
-        let manifest_dir = PathBuf::from("test-crates").join("license-test");
+        let manifest_dir = test_crate_path("license-test");
         let cargo_metadata = MetadataCommand::new()
             .manifest_path(manifest_dir.join("Cargo.toml"))
             .exec()

src/pyproject_toml.rs

@@ -773,6 +773,7 @@ impl PyProjectToml {
 
 #[cfg(test)]
 mod tests {
+    use crate::test_utils::test_crate_path;
     use crate::{
         PyProjectToml,
         pyproject_toml::{
@@ -852,7 +853,8 @@ mod tests {
 
     #[test]
     fn test_warn_missing_maturin_version() {
-        let with_constraint = PyProjectToml::new("test-crates/pyo3-pure/pyproject.toml").unwrap();
+        let with_constraint =
+            PyProjectToml::new(test_crate_path("pyo3-pure").join("pyproject.toml")).unwrap();
         assert!(with_constraint.warn_bad_maturin_version());
         let without_constraint_dir = TempDir::new().unwrap();
         let pyproject_file = without_constraint_dir.path().join("pyproject.toml");

src/test_utils.rs

@@ -0,0 +1,8 @@
+use std::path::{Path, PathBuf};
+
+/// Resolve the path to a test crate.
+pub fn test_crate_path(name: &str) -> PathBuf {
+    Path::new(env!("CARGO_MANIFEST_DIR"))
+        .join("test-crates")
+        .join(name)
+}