# HG changeset patch # User Dan Villiom Podlaski Christiansen # Date 2020-12-29 22:15:26 # Node ID db2bc9e667a1250d7a1d26ad17bbc03a3079779f # Parent fb69b51b4daad6813b484b13798d432338d5a164 rust: fix testing with $TMPDIR ≠ /tmp Differential Revision: https://phab.mercurial-scm.org/D9670 diff --git a/rust/hg-core/src/utils/path_auditor.rs b/rust/hg-core/src/utils/path_auditor.rs --- a/rust/hg-core/src/utils/path_auditor.rs +++ b/rust/hg-core/src/utils/path_auditor.rs @@ -206,6 +206,7 @@ mod tests { let base_dir = tempdir().unwrap(); let base_dir_path = base_dir.path(); + let skip = base_dir_path.components().count() - 1; let a = base_dir_path.join("a"); let b = base_dir_path.join("b"); create_dir(&a).unwrap(); @@ -215,7 +216,7 @@ mod tests { // TODO make portable std::os::unix::fs::symlink(&a, &b).unwrap(); - let buf = b.join("in_a").components().skip(2).collect::(); + let buf = b.join("in_a").components().skip(skip).collect::(); eprintln!("buf: {}", buf.display()); let path = path_to_hg_path_buf(buf).unwrap(); assert_eq!(