Extract UpstreamIndex struct

Author: Turbo87

src/tests/git.rs

@@ -1,8 +1,28 @@
+use git2::Repository;
 use std::env;
 use std::fs;
 use std::path::PathBuf;
 use std::sync::Once;
 use std::thread;
+use url::Url;
+
+pub struct UpstreamIndex {
+    pub repository: Repository,
+}
+
+impl UpstreamIndex {
+    pub fn new() -> anyhow::Result<Self> {
+        init();
+
+        let thread_local_path = bare();
+        let repository = Repository::open_bare(thread_local_path)?;
+        Ok(Self { repository })
+    }
+
+    pub fn url() -> Url {
+        Url::from_file_path(&bare()).unwrap()
+    }
+}
 
 fn root() -> PathBuf {
     env::current_dir()
@@ -12,11 +32,11 @@ fn root() -> PathBuf {
         .join(thread::current().name().unwrap())
 }
 
-pub fn bare() -> PathBuf {
+fn bare() -> PathBuf {
     root().join("bare")
 }
 
-pub fn init() {
+fn init() {
     static INIT: Once = Once::new();
     let _ = fs::remove_dir_all(&bare());
 

src/tests/util/test_app.rs

@@ -1,4 +1,5 @@
 use super::{MockAnonymousUser, MockCookieUser, MockTokenUser};
+use crate::git::UpstreamIndex;
 use crate::record;
 use crate::util::{chaosproxy::ChaosProxy, fresh_schema::FreshSchema};
 use cargo_registry::config;
@@ -12,18 +13,16 @@ use std::{rc::Rc, sync::Arc, time::Duration};
 
 use cargo_registry::git::{Repository as WorkerRepository, Repository};
 use diesel::PgConnection;
-use git2::Repository as UpstreamRepository;
 use reqwest::{blocking::Client, Proxy};
 use std::collections::HashSet;
 use swirl::Runner;
-use url::Url;
 
 struct TestAppInner {
     app: Arc<App>,
     // The bomb (if created) needs to be held in scope until the end of the test.
     _bomb: Option<record::Bomb>,
     middle: conduit_middleware::MiddlewareBuilder,
-    index: Option<UpstreamRepository>,
+    index: Option<UpstreamIndex>,
     runner: Option<Runner<Environment, DieselPool>>,
     db_chaosproxy: Option<Arc<ChaosProxy>>,
 
@@ -129,8 +128,9 @@ impl TestApp {
     }
 
     /// Obtain a reference to the upstream repository ("the index")
-    pub fn upstream_repository(&self) -> &UpstreamRepository {
-        self.0.index.as_ref().unwrap()
+    pub fn upstream_repository(&self) -> &git2::Repository {
+        let index = self.0.index.as_ref().unwrap();
+        &index.repository
     }
 
     /// Obtain a list of crates from the index HEAD
@@ -186,15 +186,13 @@ pub struct TestAppBuilder {
     config: config::Server,
     proxy: Option<String>,
     bomb: Option<record::Bomb>,
-    index: Option<UpstreamRepository>,
+    index: Option<UpstreamIndex>,
     build_job_runner: bool,
 }
 
 impl TestAppBuilder {
     /// Create a `TestApp` with an empty database
     pub fn empty(mut self) -> (TestApp, MockAnonymousUser) {
-        use crate::git;
-
         // Run each test inside a fresh database schema, deleted at the end of the test,
         // The schema will be cleared up once the app is dropped.
         let (db_chaosproxy, fresh_schema) = if !self.config.use_test_database_pool {
@@ -211,7 +209,7 @@ impl TestAppBuilder {
 
         let runner = if self.build_job_runner {
             let repository_config = RepositoryConfig {
-                index_location: Url::from_file_path(&git::bare()).unwrap(),
+                index_location: UpstreamIndex::url(),
                 credentials: Credentials::Missing,
             };
             let index = WorkerRepository::open(&repository_config).expect("Could not clone index");
@@ -286,12 +284,7 @@ impl TestAppBuilder {
     }
 
     pub fn with_git_index(mut self) -> Self {
-        use crate::git;
-
-        git::init();
-
-        let thread_local_path = git::bare();
-        self.index = Some(UpstreamRepository::open_bare(thread_local_path).unwrap());
+        self.index = Some(UpstreamIndex::new().unwrap());
         self
     }