Skip to content

Commit f5a9884

Browse files
committed
adapt to changes in gix-testtools
1 parent 8a0fedb commit f5a9884

File tree

9 files changed

+12
-16
lines changed

9 files changed

+12
-16
lines changed
Binary file not shown.
Binary file not shown.

gix-diff/tests/tree/mod.rs

-9
Original file line numberDiff line numberDiff line change
@@ -253,17 +253,8 @@ mod changes {
253253
":100644 100644 28ce6a8b26aa170e1de65536fe8abe1832bd3242 13c2aca72ab576cb5f22dc8e7f8ba8ddab553a8a M f/f"
254254
);
255255

256-
#[cfg(windows)]
257-
let tree_with_link_id = hex_to_id("3b287f8730c81d0b763c2d294618a5e32b67b4f8");
258-
#[cfg(windows)]
259-
let link_entry_oid = hex_to_id("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391");
260-
#[cfg(windows)]
261-
let link_entry_mode = EntryKind::Blob;
262-
#[cfg(not(windows))]
263256
let tree_with_link_id = hex_to_id("7e26dba59b6336f87d1d4ae3505a2da302b91c76");
264-
#[cfg(not(windows))]
265257
let link_entry_oid = hex_to_id("2e65efe2a145dda7ee51d1741299f848e5bf752e");
266-
#[cfg(not(windows))]
267258
let link_entry_mode = EntryKind::Link;
268259
assert_eq!(
269260
diff_with_previous_commit_from(&db, &all_commits["f/f mode changed to link"])?,

gix-filter/tests/driver/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ mod baseline {
1111
if cfg!(windows) {
1212
exe = exe.replace('\\', "/");
1313
}
14-
gix_testtools::scripted_fixture_read_only_with_args("baseline.sh", [exe])?;
14+
gix_testtools::scripted_fixture_read_only_with_args_single_archive("baseline.sh", [exe])?;
1515
Ok(())
1616
}
1717
}
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
make_worktree_repo.tar
2+
make_worktree_repo_packed.tar

gix/src/remote/connection/fetch/update_refs/tests.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,19 @@ mod update {
2525
}
2626

2727
fn repo(name: &str) -> gix::Repository {
28-
let dir =
29-
gix_testtools::scripted_fixture_read_only_with_args("make_fetch_repos.sh", [base_repo_path()]).unwrap();
28+
let dir = gix_testtools::scripted_fixture_read_only_with_args_single_archive(
29+
"make_fetch_repos.sh",
30+
[base_repo_path()],
31+
)
32+
.unwrap();
3033
gix::open_opts(dir.join(name), restricted()).unwrap()
3134
}
3235
fn named_repo(name: &str) -> gix::Repository {
3336
let dir = gix_testtools::scripted_fixture_read_only("make_remote_repos.sh").unwrap();
3437
gix::open_opts(dir.join(name), restricted()).unwrap()
3538
}
3639
fn repo_rw(name: &str) -> (gix::Repository, gix_testtools::tempfile::TempDir) {
37-
let dir = gix_testtools::scripted_fixture_writable_with_args(
40+
let dir = gix_testtools::scripted_fixture_writable_with_args_single_archive(
3841
"make_fetch_repos.sh",
3942
[base_repo_path()],
4043
gix_testtools::Creation::ExecuteScript,
@@ -189,7 +192,7 @@ mod update {
189192

190193
#[test]
191194
fn checked_out_branches_in_worktrees_are_rejected_with_additional_information() -> Result {
192-
let root = gix_path::realpath(gix_testtools::scripted_fixture_read_only_with_args(
195+
let root = gix_path::realpath(gix_testtools::scripted_fixture_read_only_with_args_single_archive(
193196
"make_fetch_repos.sh",
194197
[base_repo_path()],
195198
)?)?;

gix/tests/fixtures/generated-archives/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/make_worktree_repo.tar
2+
/make_worktree_repo_bare.tar
23
/make_worktree_repo_with_configs.tar
34
/make_remote_repos.tar
45
/make_complex_shallow_repo.tar

gix/tests/remote/fetch.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ mod blocking_and_async_io {
6363
args: impl IntoIterator<Item = S>,
6464
mode: Mode,
6565
) -> Result<(gix::Repository, gix_testtools::tempfile::TempDir), gix::open::Error> {
66-
let dir = gix_testtools::scripted_fixture_writable_with_args(
66+
let dir = gix_testtools::scripted_fixture_writable_with_args_single_archive(
6767
"make_fetch_repos.sh",
6868
[{
6969
let mut url = base_repo_path();

gix/tests/repository/shallow.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ mod traverse {
7272
#[parallel]
7373
fn complex_graphs_can_be_iterated_despite_multiple_shallow_boundaries() -> crate::Result {
7474
let base = gix_path::realpath(gix_testtools::scripted_fixture_read_only("make_remote_repos.sh")?.join("base"))?;
75-
let shallow_base = gix_testtools::scripted_fixture_read_only_with_args(
75+
let shallow_base = gix_testtools::scripted_fixture_read_only_with_args_single_archive(
7676
"make_complex_shallow_repo.sh",
7777
Some(base.to_string_lossy()),
7878
)?;

0 commit comments

Comments
 (0)