Skip to content

Commit

Permalink
Fix tests from changes in libgit2 v1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
bnjmnt4n committed Mar 22, 2024
1 parent 796004e commit 34dfbb1
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/cred.rs
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ mod test {
macro_rules! test_cfg( ($($k:expr => $v:expr),*) => ({
let td = TempDir::new().unwrap();
let mut cfg = Config::new().unwrap();
cfg.add_file(&td.path().join("cfg"), ConfigLevel::Highest, false).unwrap();
cfg.add_file(&td.path().join("cfg"), ConfigLevel::App, false).unwrap();
$(cfg.set_str($k, $v).unwrap();)*
cfg
}) );
Expand Down
6 changes: 4 additions & 2 deletions tests/add_extensions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ fn test_add_extensions() -> Result<(), Error> {

let extensions = unsafe { get_extensions() }?;

assert_eq!(extensions.len(), 3);
assert_eq!(extensions.len(), 4);
assert_eq!(extensions.get(0), Some("custom"));
// The objectformat extension was added in 1.6
assert_eq!(extensions.get(1), Some("noop"));
// The objectformat extension was added in 1.6
assert_eq!(extensions.get(2), Some("objectformat"));
// The objectformat extension was added in 1.8
assert_eq!(extensions.get(3), Some("worktreeconfig"));

Ok(())
}
4 changes: 3 additions & 1 deletion tests/get_extensions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ use git2::Error;
fn test_get_extensions() -> Result<(), Error> {
let extensions = unsafe { get_extensions() }?;

assert_eq!(extensions.len(), 2);
assert_eq!(extensions.len(), 3);
assert_eq!(extensions.get(0), Some("noop"));
// The objectformat extension was added in 1.6
assert_eq!(extensions.get(1), Some("objectformat"));
// The objectformat extension was added in 1.8
assert_eq!(extensions.get(2), Some("worktreeconfig"));

Ok(())
}
9 changes: 8 additions & 1 deletion tests/remove_extensions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ use git2::Error;
#[test]
fn test_remove_extensions() -> Result<(), Error> {
unsafe {
set_extensions(&["custom", "!ignore", "!noop", "!objectformat", "other"])?;
set_extensions(&[
"custom",
"!ignore",
"!noop",
"!objectformat",
"!worktreeconfig",
"other",
])?;
}

let extensions = unsafe { get_extensions() }?;
Expand Down

0 comments on commit 34dfbb1

Please sign in to comment.