Move pack fixtures into place which resembles an actual object db (#59)

Byron · Apr 3, 2021 · fb5cea4 · fb5cea4
1 parent 1e727af
commit fb5cea4
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/git-odb/src/zlib/stream/deflate/tests.rs b/git-odb/src/zlib/stream/deflate/tests.rs
@@ -25,8 +25,9 @@ mod deflate_stream {
     #[test]
     fn big_file_small_writes() -> Result<(), Box<dyn std::error::Error>> {
         let mut w = DeflateWriter::new(Vec::new());
-        let bytes =
-            include_bytes!("../../../../tests/fixtures/packs/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.pack");
+        let bytes = include_bytes!(
+            "../../../../tests/fixtures/objects/pack/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.pack"
+        );
         for chunk in bytes.chunks(2) {
             assert_eq!(w.write(chunk)?, chunk.len());
         }
@@ -38,8 +39,9 @@ mod deflate_stream {
     #[test]
     fn big_file_a_few_big_writes() -> Result<(), Box<dyn std::error::Error>> {
         let mut w = DeflateWriter::new(Vec::new());
-        let bytes =
-            include_bytes!("../../../../tests/fixtures/packs/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.pack");
+        let bytes = include_bytes!(
+            "../../../../tests/fixtures/objects/pack/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.pack"
+        );
         for chunk in bytes.chunks(4096 * 9) {
             assert_eq!(w.write(chunk)?, chunk.len());
         }

diff --git a/...dfa9e156ab73caae3b6da867192221f2089c2.idx → ...dfa9e156ab73caae3b6da867192221f2089c2.idx b/...dfa9e156ab73caae3b6da867192221f2089c2.idx → ...dfa9e156ab73caae3b6da867192221f2089c2.idx
diff --git a/...fa9e156ab73caae3b6da867192221f2089c2.pack → ...fa9e156ab73caae3b6da867192221f2089c2.pack b/...fa9e156ab73caae3b6da867192221f2089c2.pack → ...fa9e156ab73caae3b6da867192221f2089c2.pack
diff --git a/...f8e71d8c18879e499335762dd95119d93d9f1.idx → ...f8e71d8c18879e499335762dd95119d93d9f1.idx b/...f8e71d8c18879e499335762dd95119d93d9f1.idx → ...f8e71d8c18879e499335762dd95119d93d9f1.idx
diff --git a/...8e71d8c18879e499335762dd95119d93d9f1.pack → ...8e71d8c18879e499335762dd95119d93d9f1.pack b/...8e71d8c18879e499335762dd95119d93d9f1.pack → ...8e71d8c18879e499335762dd95119d93d9f1.pack
diff --git a/...38c19fb16422b6bbcce24387b3264416d485b.idx → ...38c19fb16422b6bbcce24387b3264416d485b.idx b/...38c19fb16422b6bbcce24387b3264416d485b.idx → ...38c19fb16422b6bbcce24387b3264416d485b.idx
diff --git a/...8c19fb16422b6bbcce24387b3264416d485b.pack → ...8c19fb16422b6bbcce24387b3264416d485b.pack b/...8c19fb16422b6bbcce24387b3264416d485b.pack → ...8c19fb16422b6bbcce24387b3264416d485b.pack
diff --git a/git-odb/tests/pack/mod.rs b/git-odb/tests/pack/mod.rs
@@ -1,11 +1,11 @@
-const SMALL_PACK_INDEX: &str = "packs/pack-a2bf8e71d8c18879e499335762dd95119d93d9f1.idx";
-const SMALL_PACK: &str = "packs/pack-a2bf8e71d8c18879e499335762dd95119d93d9f1.pack";
+const SMALL_PACK_INDEX: &str = "objects/pack/pack-a2bf8e71d8c18879e499335762dd95119d93d9f1.idx";
+const SMALL_PACK: &str = "objects/pack/pack-a2bf8e71d8c18879e499335762dd95119d93d9f1.pack";
 
-const INDEX_V1: &str = "packs/pack-c0438c19fb16422b6bbcce24387b3264416d485b.idx";
-const PACK_FOR_INDEX_V1: &str = "packs/pack-c0438c19fb16422b6bbcce24387b3264416d485b.pack";
+const INDEX_V1: &str = "objects/pack/pack-c0438c19fb16422b6bbcce24387b3264416d485b.idx";
+const PACK_FOR_INDEX_V1: &str = "objects/pack/pack-c0438c19fb16422b6bbcce24387b3264416d485b.pack";
 
-const INDEX_V2: &str = "packs/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.idx";
-const PACK_FOR_INDEX_V2: &str = "packs/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.pack";
+const INDEX_V2: &str = "objects/pack/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.idx";
+const PACK_FOR_INDEX_V2: &str = "objects/pack/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.pack";
 
 const PACKS_AND_INDICES: &[(&'static str, &'static str)] =
     &[(SMALL_PACK_INDEX, SMALL_PACK), (INDEX_V1, PACK_FOR_INDEX_V1)];