rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2024-12-12 19:18:24 +02:00
Code Issues Releases Activity

ignore: fix failing test

Browse Source 
This fixes fallout from fixing #1520.
This commit is contained in:
Andrew Gallant 2020-03-16 19:16:24 -04:00
parent 34edb8123a
commit 8ba6ccd159
No known key found for this signature in database
GPG Key ID: B2E3A4923F8B0D44
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crates/ignore/src/dir.rs
View File

@ -837,7 +837,7 @@ fn resolve_git_commondir(
#[cfg(test)]
mod tests {
use std::fs::{self, File};
use std::io::{self, Write};
use std::io::Write;
use std::path::Path;
use dir::IgnoreBuilder;
@ -1170,22 +1170,9 @@ mod tests {
// missing commondir file
assert!(fs::remove_file(commondir_path()).is_ok());
let (_, err) = ib.add_child(td.path().join("linked-worktree"));
assert!(err.is_some());
assert!(match err {
Some(Error::WithPath { path, err }) => {
if path != commondir_path() {
false
} else {
match *err {
Error::Io(ioerr) => {
ioerr.kind() == io::ErrorKind::NotFound
}
_ => false,
}
}
}
_ => false,
});
// We squash the error in this case, because it occurs in repositories
// that are not linked worktrees but have submodules.
assert!(err.is_none());
wfile(td.path().join("linked-worktree/.git"), "garbage");
let (_, err) = ib.add_child(td.path().join("linked-worktree"));
@ -1193,6 +1180,6 @@ mod tests {
wfile(td.path().join("linked-worktree/.git"), "gitdir: garbage");
let (_, err) = ib.add_child(td.path().join("linked-worktree"));
assert!(err.is_some());
assert!(err.is_none());
}
}