test for auto-clone (#16)

Author: Byron

Cargo.toml

@@ -28,4 +28,3 @@ git-testtools = "0.8.0"
 # git-repository = "0.22.1"
 git-repository = { version = "0.22.1", git = "https://github.com/Byron/gitoxide", branch = "for-crates-index-diff" }
 tempdir = "0.3.5"
-serial_test = "0.6.0"

tests/index/mod.rs

@@ -1,4 +1,6 @@
 use crates_index_diff::Index;
+use git_testtools::tempfile::TempDir;
+use std::path::PathBuf;
 
 mod changes_from_objects;
 
@@ -32,14 +34,31 @@ fn peek_changes() {
     );
 }
 
-mod old;
+#[test]
+fn clone_if_needed() {
+    let tmp = TempDir::new().unwrap();
+    let options = || crates_index_diff::index::CloneOptions {
+        repository_url: fixture_dir().unwrap().join("base").display().to_string(),
+        fetch_options: None,
+    };
+    Index::from_path_or_cloned_with_options(tmp.path(), options())
+        .expect("successful clone to be created");
+    Index::from_path_or_cloned_with_options(tmp.path(), options())
+        .expect("second instance re-uses existing clone");
+}
 
 fn index_ro() -> crate::Result<Index> {
-    let dir = git_testtools::scripted_fixture_repo_read_only_with_args(
+    let dir = fixture_dir()?;
+    Ok(Index::from_path_or_cloned(dir.join("clone"))?)
+}
+
+fn fixture_dir() -> crate::Result<PathBuf> {
+    Ok(git_testtools::scripted_fixture_repo_read_only_with_args(
         "make-index-from-parts.sh",
         std::env::current_dir()
             .ok()
             .map(|p| p.to_str().unwrap().to_owned()),
-    )?;
-    Ok(Index::from_path_or_cloned(dir.join("clone"))?)
+    )?)
 }
+
+mod old;

tests/index/old.rs

@@ -1,20 +1,11 @@
 use crates_index_diff::*;
 use git2::Reference;
-use serial_test::serial;
 use std::{env, path::PathBuf};
 use tempdir::TempDir;
 
 const NUM_VERSIONS_AT_RECENT_COMMIT: usize = 39752;
 const REV_ONE_UNYANKED: &str = "f8cb00181";
 
-#[test]
-#[ignore] // This test takes too long for my taste, this library is stable by now
-fn clone_if_needed() {
-    let tmp = TempDir::new("new-index").unwrap();
-    Index::from_path_or_cloned(tmp.path()).expect("successful clone to be created");
-    Index::from_path_or_cloned(tmp.path()).expect("second instance re-uses existing clone");
-}
-
 fn make_index() -> (Index, TempDir) {
     let tmp = TempDir::new("new-index").unwrap();
     let index = Index::from_path_or_cloned(
@@ -34,7 +25,6 @@ fn origin_master_of(index: &Index) -> Reference<'_> {
 }
 
 #[test]
-#[serial]
 #[ignore]
 fn quick_changes_since_last_fetch() {
     let (mut index, _tmp) = make_index();