Skip to content

Commit 34dfbb1

Browse files
committed
Fix tests from changes in libgit2 v1.8
1 parent 796004e commit 34dfbb1

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

src/cred.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ mod test {
482482
macro_rules! test_cfg( ($($k:expr => $v:expr),*) => ({
483483
let td = TempDir::new().unwrap();
484484
let mut cfg = Config::new().unwrap();
485-
cfg.add_file(&td.path().join("cfg"), ConfigLevel::Highest, false).unwrap();
485+
cfg.add_file(&td.path().join("cfg"), ConfigLevel::App, false).unwrap();
486486
$(cfg.set_str($k, $v).unwrap();)*
487487
cfg
488488
}) );

tests/add_extensions.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ fn test_add_extensions() -> Result<(), Error> {
1111

1212
let extensions = unsafe { get_extensions() }?;
1313

14-
assert_eq!(extensions.len(), 3);
14+
assert_eq!(extensions.len(), 4);
1515
assert_eq!(extensions.get(0), Some("custom"));
16-
// The objectformat extension was added in 1.6
1716
assert_eq!(extensions.get(1), Some("noop"));
17+
// The objectformat extension was added in 1.6
1818
assert_eq!(extensions.get(2), Some("objectformat"));
19+
// The objectformat extension was added in 1.8
20+
assert_eq!(extensions.get(3), Some("worktreeconfig"));
1921

2022
Ok(())
2123
}

tests/get_extensions.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ use git2::Error;
77
fn test_get_extensions() -> Result<(), Error> {
88
let extensions = unsafe { get_extensions() }?;
99

10-
assert_eq!(extensions.len(), 2);
10+
assert_eq!(extensions.len(), 3);
1111
assert_eq!(extensions.get(0), Some("noop"));
1212
// The objectformat extension was added in 1.6
1313
assert_eq!(extensions.get(1), Some("objectformat"));
14+
// The objectformat extension was added in 1.8
15+
assert_eq!(extensions.get(2), Some("worktreeconfig"));
1416

1517
Ok(())
1618
}

tests/remove_extensions.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@ use git2::Error;
66
#[test]
77
fn test_remove_extensions() -> Result<(), Error> {
88
unsafe {
9-
set_extensions(&["custom", "!ignore", "!noop", "!objectformat", "other"])?;
9+
set_extensions(&[
10+
"custom",
11+
"!ignore",
12+
"!noop",
13+
"!objectformat",
14+
"!worktreeconfig",
15+
"other",
16+
])?;
1017
}
1118

1219
let extensions = unsafe { get_extensions() }?;

0 commit comments

Comments
 (0)