Skip to content

Improve filesystem timestamp granularity check #1899

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.

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

Merged
merged 6 commits into from
Mar 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion gix-fs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ serde = { version = "1.0.114", optional = true, default-features = false, featur
fastrand = { version = "2.1.0", default-features = false, features = ["std"] }

[dev-dependencies]
tempfile = "3.5.0"
crossbeam-channel = "0.5.0"
is_ci = "1.1.1"
tempfile = "3.5.0"
35 changes: 23 additions & 12 deletions gix-fs/tests/fs/snapshot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::path::Path;
#[test]
fn journey() -> Result<(), Box<dyn std::error::Error>> {
let tmp = tempfile::tempdir().unwrap();
if !has_nanosecond_times(tmp.path())? {
if !has_granular_times(tmp.path())? {
return Ok(());
}

Expand Down Expand Up @@ -41,17 +41,28 @@ fn journey() -> Result<(), Box<dyn std::error::Error>> {
Ok(())
}

fn has_nanosecond_times(root: &Path) -> std::io::Result<bool> {
let test_file = root.join("nanosecond-test");
fn has_granular_times(root: &Path) -> std::io::Result<bool> {
let n = 50;

std::fs::write(&test_file, "a")?;
let first_time = test_file.metadata()?.modified()?;

std::fs::write(&test_file, "b")?;
let second_time = test_file.metadata()?.modified()?;
let paths = (0..n).map(|i| root.join(format!("{i:03}")));
for (index, path) in paths.clone().enumerate() {
std::fs::write(&path, index.to_string().as_bytes())?;
}
let mut times = Vec::new();
for path in paths {
times.push(path.symlink_metadata()?.modified()?);
}
times.sort();
times.dedup();

Ok(second_time.duration_since(first_time).is_ok_and(|d|
// This can be falsely false if a filesystem would be ridiculously fast,
// which means a test won't run even though it could. But that's OK, and unlikely.
d.subsec_nanos() != 0))
// This could be wrongly false if a filesystem has very precise timings yet is ridiculously
// fast. Then the `journey` test wouldn't run, though it could. But that's OK, and unlikely.
if cfg!(target_os = "macos") && is_ci::cached() {
assert_eq!(
times.len(),
n,
"should have very granular timestamps at least on macOS on CI"
);
}
Ok(times.len() == n)
}
Loading