chore: reorganize tests to get rid of feature toggles that are for internal testing only

Author: Byron

Cargo.lock

@@ -281,6 +281,7 @@ members = [
 
     "gix-diff/tests",
     "gix-pack/tests",
+    "gix-odb/tests",
     "gix-worktree-state/tests",
     "gix-status/tests",
     "gix-worktree/tests",

Cargo.toml

@@ -8,25 +8,15 @@ description = "Implements various git object databases"
 edition = "2021"
 include = ["src/**/*", "LICENSE-*", "CHANGELOG.md"]
 rust-version = "1.65"
+autotests = false
 
 [lib]
 doctest = false
 
 [features]
-internal-testing-gix-features-parallel = ["gix-features/parallel"]
 ## Data structures implement `serde::Serialize` and `serde::Deserialize`.
 serde= ["dep:serde", "gix-hash/serde", "gix-object/serde", "gix-pack/serde"]
 
-[[test]]
-name = "multi-threaded"
-path = "tests/odb-multi-threaded.rs"
-required-features = ["internal-testing-gix-features-parallel"]
-
-[[test]]
-name = "single-threaded"
-path = "tests/odb-single-threaded.rs"
-required-features = []
-
 [dependencies]
 gix-features = { version = "^0.32.1", path = "../gix-features", features = ["rustsha1", "walkdir", "zlib", "crc32" ] }
 gix-hash = { version = "^0.11.4", path = "../gix-hash" }
@@ -44,13 +34,13 @@ arc-swap = "1.5.0"
 
 document-features = { version = "0.2.0", optional = true }
 
-[dev-dependencies]
-gix-testtools = { path = "../tests/tools"}
-gix-actor = { path = "../gix-actor" }
-pretty_assertions = "1.0.0"
-filetime = "0.2.15"
-maplit = "1.0.2"
-crossbeam-channel = "0.5.6"
+#[dev-dependencies]
+#gix-testtools = { path = "../tests/tools"}
+#gix-actor = { path = "../gix-actor" }
+#pretty_assertions = "1.0.0"
+#filetime = "0.2.15"
+#maplit = "1.0.2"
+#crossbeam-channel = "0.5.6"
 
 [package.metadata.docs.rs]
 features = ["document-features", "serde"]

gix-odb/Cargo.toml

@@ -0,0 +1,32 @@
+[package]
+name = "gix-odb-tests"
+version = "0.0.0"
+repository = "https://github.com/Byron/gitoxide"
+authors = ["Sebastian Thiel <[email protected]>"]
+license = "MIT OR Apache-2.0"
+description = "Tests for gix-odb with feature-toggle support"
+edition = "2021"
+rust-version = "1.65"
+publish = false
+
+[features]
+gix-features-parallel = ["gix-features/parallel"]
+
+[[test]]
+name = "integrate"
+path = "integrate.rs"
+
+[dev-dependencies]
+gix-odb = { path = ".." }
+gix-features = { path = "../../gix-features" }
+gix-hash = { version = "^0.11.4", path = "../../gix-hash" }
+gix-date = { version = "^0.7.2", path = "../../gix-date" }
+gix-object = { version = "^0.34.0", path = "../../gix-object" }
+gix-pack = { version = "^0.41.0", path = "../../gix-pack" }
+
+gix-testtools = { path = "../../tests/tools"}
+gix-actor = { path = "../../gix-actor" }
+pretty_assertions = "1.0.0"
+filetime = "0.2.15"
+maplit = "1.0.2"
+

gix-odb/tests/Cargo.toml

@@ -0,0 +1,2 @@
+mod odb;
+use odb::*;

gix-odb/tests/integrate.rs

@@ -1,7 +1,7 @@
-use crate::fixture_path;
+use gix_testtools::fixture_path_standalone;
 
 fn db() -> gix_odb::Handle {
-    gix_odb::at(fixture_path("objects")).expect("valid object path")
+    gix_odb::at(fixture_path_standalone("objects")).expect("valid object path")
 }
 
 use crate::hex_to_id;

gix-odb/tests/odb-multi-threaded.rs

@@ -1,4 +1,5 @@
 use gix_hash::ObjectId;
+use gix_testtools::fixture_path_standalone;
 pub use gix_testtools::{fixture_path, scripted_fixture_read_only};
 
 pub fn hex_to_id(hex: &str) -> ObjectId {
@@ -8,11 +9,11 @@ pub fn hex_to_id(hex: &str) -> ObjectId {
 pub type Result<T = ()> = std::result::Result<T, Box<dyn std::error::Error>>;
 
 fn db() -> gix_odb::Handle {
-    gix_odb::at(fixture_path("objects")).expect("valid object path")
+    gix_odb::at(fixture_path_standalone("objects")).expect("valid object path")
 }
 
 fn db_small_packs() -> gix_odb::Handle {
-    gix_odb::at(fixture_path("repos/small-packs.git/objects")).unwrap()
+    gix_odb::at(fixture_path_standalone("repos/small-packs.git/objects")).unwrap()
 }
 
 pub mod alternate;

gix-odb/tests/odb-single-threaded.rs

@@ -2,7 +2,7 @@ use std::process::Command;
 
 use gix_hash::ObjectId;
 use gix_odb::{store, store::iter::Ordering, Find, FindExt, Header, Write};
-use gix_testtools::fixture_path;
+use gix_testtools::fixture_path_standalone;
 
 use crate::{hex_to_id, odb::db};
 
@@ -14,18 +14,18 @@ fn all_orderings() -> [Ordering; 2] {
 }
 
 /// indices, multi-pack-index, loose odb
-fn db_with_all_object_sources() -> crate::Result<(gix_odb::Handle, tempfile::TempDir)> {
+fn db_with_all_object_sources() -> crate::Result<(gix_odb::Handle, gix_testtools::tempfile::TempDir)> {
     let objects_dir = gix_testtools::tempfile::tempdir()?;
-    gix_testtools::copy_recursively_into_existing_dir(fixture_path("objects"), &objects_dir)?;
+    gix_testtools::copy_recursively_into_existing_dir(fixture_path_standalone("objects"), &objects_dir)?;
 
     let multi_pack_index = std::fs::OpenOptions::new()
         .write(true)
         .create_new(true)
         .open(objects_dir.path().join("pack/multi-pack-index"))?;
     gix_odb::pack::multi_index::File::write_from_index_paths(
         vec![
-            fixture_path("objects/pack/pack-a2bf8e71d8c18879e499335762dd95119d93d9f1.idx"),
-            fixture_path("objects/pack/pack-c0438c19fb16422b6bbcce24387b3264416d485b.idx"),
+            fixture_path_standalone("objects/pack/pack-a2bf8e71d8c18879e499335762dd95119d93d9f1.idx"),
+            fixture_path_standalone("objects/pack/pack-c0438c19fb16422b6bbcce24387b3264416d485b.idx"),
         ],
         multi_pack_index,
         gix_features::progress::Discard,
@@ -39,7 +39,7 @@ fn db_with_all_object_sources() -> crate::Result<(gix_odb::Handle, tempfile::Tem
 
 #[test]
 fn multi_index_access() -> crate::Result {
-    let dir = gix_testtools::scripted_fixture_writable("make_repo_multi_index.sh")?;
+    let dir = gix_testtools::scripted_fixture_writable_standalone("make_repo_multi_index.sh")?;
     let handle = gix_odb::at(dir.path().join(".git/objects"))?;
 
     assert_eq!(
@@ -145,7 +145,7 @@ fn multi_index_access() -> crate::Result {
 
 #[test]
 fn multi_index_keep_open() -> crate::Result {
-    let dir = gix_testtools::scripted_fixture_writable("make_repo_multi_index.sh")?;
+    let dir = gix_testtools::scripted_fixture_writable_standalone("make_repo_multi_index.sh")?;
     let (stable_handle, handle) = {
         let mut stable_handle = gix_odb::at(dir.path().join(".git/objects"))?;
         let handle = stable_handle.clone();
@@ -210,7 +210,7 @@ fn multi_index_keep_open() -> crate::Result {
 
 #[test]
 fn write() -> crate::Result {
-    let dir = tempfile::tempdir()?;
+    let dir = gix_testtools::tempfile::tempdir()?;
     let mut handle = gix_odb::at(dir.path())?;
     // It should refresh once even if the refresh mode is never, just to initialize the index
     handle.refresh_never();
@@ -222,7 +222,7 @@ fn write() -> crate::Result {
 
 #[test]
 fn alternate_dbs_query() -> crate::Result {
-    let dir = gix_testtools::scripted_fixture_read_only("make_alternates_odb.sh")?;
+    let dir = gix_testtools::scripted_fixture_read_only_standalone("make_alternates_odb.sh")?;
     let handle = gix_odb::at(dir.join(".git/objects"))?;
 
     let alternates = handle.store_ref().alternate_db_paths()?;
@@ -242,7 +242,7 @@ fn alternate_dbs_query() -> crate::Result {
 
 #[test]
 fn object_replacement() -> crate::Result {
-    let dir = gix_testtools::scripted_fixture_read_only("make_replaced_history.sh")?;
+    let dir = gix_testtools::scripted_fixture_read_only_standalone("make_replaced_history.sh")?;
     let handle = gix_odb::at(dir.join(".git/objects"))?;
     let mut buf = Vec::new();
     let short_history_link = hex_to_id("434e5a872d6738d1fffd1e11e52a1840b73668c6");
@@ -797,7 +797,10 @@ fn auto_refresh_with_and_without_id_stability() -> crate::Result {
             .success(),
         "git should work"
     );
-    gix_testtools::copy_recursively_into_existing_dir(fixture_path("objects/pack"), tmp.path().join("objects/pack"))?;
+    gix_testtools::copy_recursively_into_existing_dir(
+        fixture_path_standalone("objects/pack"),
+        tmp.path().join("objects/pack"),
+    )?;
     let hide_pack = |name: &str| {
         let stem = tmp.path().join("objects/pack").join(name);
         std::fs::rename(stem.with_extension("idx"), stem.with_extension("idx.bak")).unwrap();
@@ -940,7 +943,7 @@ mod verify {
     use std::sync::atomic::AtomicBool;
 
     use gix_features::progress;
-    use gix_testtools::fixture_path;
+    use gix_testtools::fixture_path_standalone;
 
     use crate::store::dynamic::db;
 
@@ -954,20 +957,20 @@ mod verify {
         assert_eq!(outcome.index_statistics.len(), 3, "there are only three packs to check");
         assert_eq!(
             outcome.index_statistics[0].path,
-            fixture_path("objects/pack/pack-c0438c19fb16422b6bbcce24387b3264416d485b.idx")
+            fixture_path_standalone("objects/pack/pack-c0438c19fb16422b6bbcce24387b3264416d485b.idx")
         );
         assert_eq!(
             outcome.index_statistics[1].path,
-            fixture_path("objects/pack/pack-a2bf8e71d8c18879e499335762dd95119d93d9f1.idx")
+            fixture_path_standalone("objects/pack/pack-a2bf8e71d8c18879e499335762dd95119d93d9f1.idx")
         );
         assert_eq!(
             outcome.index_statistics[2].path,
-            fixture_path("objects/pack/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.idx")
+            fixture_path_standalone("objects/pack/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.idx")
         );
         assert_eq!(
             outcome.loose_object_stores,
             vec![gix_odb::store::verify::integrity::LooseObjectStatistics {
-                path: fixture_path("objects"),
+                path: fixture_path_standalone("objects"),
                 statistics: gix_odb::loose::verify::integrity::Statistics { num_objects: 7 }
             }]
         );