Skip to content

Commit ca31249

Browse files
committed
re-add tests that were previously 'lost' due to an incorrect feature toggle
1 parent 36d1b69 commit ca31249

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gix-odb/tests/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ gix-date = { path = "../../gix-date" }
2424
gix-object = { path = "../../gix-object" }
2525
gix-pack = { path = "../../gix-pack" }
2626

27-
gix-testtools = { path = "../../tests/tools"}
27+
gix-testtools = { path = "../../tests/tools" }
2828
gix-actor = { path = "../../gix-actor" }
2929
pretty_assertions = "1.0.0"
3030
filetime = "0.2.15"
3131
maplit = "1.0.2"
32+
crossbeam-channel = "0.5.13"
3233

Binary file not shown.

gix-odb/tests/odb/regression/mod.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ mod repo_with_small_packs {
1717
}
1818

1919
#[test]
20-
#[cfg(feature = "internal-testing-gix-features-parallel")]
20+
#[cfg(feature = "gix-features-parallel")]
2121
fn multi_threaded_access_will_not_panic() -> crate::Result {
2222
for arg in ["no", "without-multi-index"] {
23-
let base = gix_testtools::scripted_fixture_read_only_with_args("make_repo_multi_index.sh", Some(arg))?
24-
.join(".git")
25-
.join("objects");
23+
let base =
24+
gix_testtools::scripted_fixture_read_only_with_args_standalone("make_repo_multi_index.sh", Some(arg))?
25+
.join(".git")
26+
.join("objects");
2627
let store = gix_odb::at(base)?;
2728
let (tx, barrier) = crossbeam_channel::unbounded::<()>();
2829
let handles = (0..std::thread::available_parallelism()?.get()).map(|tid| {
@@ -36,7 +37,7 @@ mod repo_with_small_packs {
3637
for id in store.iter()? {
3738
let id = id?;
3839
assert!(
39-
store.try_find(id, &mut buf).is_ok(),
40+
store.try_find(&id, &mut buf).is_ok(),
4041
"Thread {} could not find {}",
4142
tid,
4243
id

gix-ref/tests/store/mod.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
#[test]
2-
#[cfg(feature = "internal-testing-gix-features-parallel")]
2+
#[cfg(feature = "gix-features-parallel")]
33
fn is_send_and_sync() {
44
pub fn store_at(name: &str) -> crate::Result<gix_ref::file::Store> {
55
let path = gix_testtools::scripted_fixture_read_only_standalone(name)?;
66
Ok(gix_ref::file::Store::at(
77
path.join(".git"),
8-
gix_ref::store::WriteReflog::Normal,
9-
gix_hash::Kind::Sha1,
8+
gix_ref::store::init::Options {
9+
write_reflog: gix_ref::store::WriteReflog::Normal,
10+
object_hash: gix_hash::Kind::Sha1,
11+
..Default::default()
12+
},
1013
))
1114
}
1215

0 commit comments

Comments
 (0)