Merge pull request #399 from ahrav/feature/dedupe-git-test-helpers

Feature/dedupe git test helpers

Author: ahrav

Cargo.lock

@@ -15,4 +15,5 @@ scanner-git.workspace = true
 thiserror = { workspace = true }
 
 [dev-dependencies]
+gossip-stdx = { workspace = true, features = ["git-test-support"] }
 tempfile = "3"

crates/gossip-orchestrator/Cargo.toml

@@ -1227,7 +1227,7 @@ mod tests {
 
     use super::*;
     use crate::git_request::{GitRequest, GitRequestSelection, GitRequestTarget};
-    use crate::test_support::{init_git_repo, run_config, run_git_in};
+    use crate::test_support::{init_git_repo, run_config, run_git};
 
     fn tenant(byte: u8) -> TenantId {
         TenantId::from_bytes([byte; 32])
@@ -1470,8 +1470,8 @@ mod tests {
         let dir = tempdir().expect("tempdir");
         init_repo(dir.path());
         fs::write(dir.path().join("tracked.txt"), "v1\n").expect("write tracked file");
-        run_git_in(dir.path(), &["add", "."]);
-        run_git_in(dir.path(), &["commit", "-m", "first"]);
+        run_git(dir.path(), &["add", "."]);
+        run_git(dir.path(), &["commit", "-m", "first"]);
         let commit = current_commit_oid(dir.path());
 
         let (_, payload) = payload_from_request(
@@ -1508,8 +1508,8 @@ mod tests {
         let dir = tempdir().expect("tempdir");
         init_repo(dir.path());
         fs::write(dir.path().join("tracked.txt"), "v1\n").expect("write tracked file");
-        run_git_in(dir.path(), &["add", "."]);
-        run_git_in(dir.path(), &["commit", "-m", "first"]);
+        run_git(dir.path(), &["add", "."]);
+        run_git(dir.path(), &["commit", "-m", "first"]);
         let commit = current_commit_oid(dir.path());
 
         let (_, payload) = payload_from_request(
@@ -1552,7 +1552,7 @@ mod tests {
     fn lowering_explicit_commit_rejects_missing_commit() {
         let dir = tempdir().expect("tempdir");
         init_repo(dir.path());
-        run_git_in(dir.path(), &["commit", "--allow-empty", "-m", "first"]);
+        run_git(dir.path(), &["commit", "--allow-empty", "-m", "first"]);
 
         let (_, payload) = payload_from_request(
             GitRequest::repo_with_explicit_commit(

crates/gossip-orchestrator/src/git_payload.rs

@@ -782,7 +782,7 @@ mod tests {
     use tempfile::tempdir;
 
     use super::*;
-    use crate::test_support::{init_git_repo, run_config, run_git_in};
+    use crate::test_support::{init_committed_repo, init_git_repo, run_config};
 
     fn tenant(byte: u8) -> TenantId {
         TenantId::from_bytes([byte; 32])
@@ -792,11 +792,8 @@ mod tests {
         init_git_repo(dir, "git-request-tests@example.com", "Git Request Tests");
     }
 
-    fn init_committed_repo(dir: &Path) {
-        init_repo(dir);
-        fs::write(dir.join("fixture.txt"), "fixture").expect("write fixture");
-        run_git_in(dir, &["add", "."]);
-        run_git_in(dir, &["commit", "-q", "-m", "fixture"]);
+    fn init_committed(dir: &Path) {
+        init_committed_repo(dir, "git-request-tests@example.com", "Git Request Tests");
     }
 
     fn default_scan_mode() -> GitScanMode {
@@ -1060,7 +1057,7 @@ mod tests {
     #[test]
     fn request_debug_redacts_repo_path_refs_commit_and_display_name() {
         let dir = tempdir().expect("tempdir");
-        init_committed_repo(dir.path());
+        init_committed(dir.path());
 
         let refs_request = GitRequest::new(
             tenant(0x90),
@@ -1096,7 +1093,7 @@ mod tests {
     #[test]
     fn normalized_debug_redacts_repo_path_refs_commit_and_display_name() {
         let dir = tempdir().expect("tempdir");
-        init_committed_repo(dir.path());
+        init_committed(dir.path());
 
         let refs_request = GitRequest::new(
             tenant(0x91),

crates/gossip-orchestrator/src/git_request.rs

@@ -1,35 +1,11 @@
 //! Shared test fixtures for the orchestrator crate.
 
-use std::path::Path;
-use std::process::Command;
-
 use gossip_coordination::{CursorSemantics, RunConfig};
 
+pub(crate) use gossip_stdx::git_test_support::{init_committed_repo, init_git_repo, run_git};
+
 /// Default run configuration for orchestrator unit tests.
 pub(crate) fn run_config() -> RunConfig {
     RunConfig::try_new(CursorSemantics::Completed, 30_000, Some(5))
         .expect("run config should be valid")
 }
-
-pub(crate) fn run_git_in(dir: &Path, args: &[&str]) {
-    let output = Command::new("git")
-        .arg("-C")
-        .arg(dir)
-        .args(args)
-        .output()
-        .expect("run git command");
-    assert!(
-        output.status.success(),
-        "git command failed: git -C {} {}\nstdout:{}\nstderr:{}",
-        dir.display(),
-        args.join(" "),
-        String::from_utf8_lossy(&output.stdout),
-        String::from_utf8_lossy(&output.stderr),
-    );
-}
-
-pub(crate) fn init_git_repo(dir: &Path, email: &str, name: &str) {
-    run_git_in(dir, &["init", "-q", "-b", "main"]);
-    run_git_in(dir, &["config", "user.email", email]);
-    run_git_in(dir, &["config", "user.name", name]);
-}

crates/gossip-orchestrator/src/test_support.rs

@@ -9,7 +9,7 @@ description = "Runtime orchestration APIs for scanner-rs direct and connector ex
 
 [features]
 default = []
-test-support = []
+test-support = ["gossip-stdx/git-test-support"]
 aegis-pure-rust = [
     "scanner-engine/aegis-pure-rust",
     "scanner-scheduler/aegis-pure-rust",
@@ -36,6 +36,7 @@ tracing.workspace = true
 
 [dev-dependencies]
 gossip-persistence-inmemory.workspace = true
+gossip-stdx = { workspace = true, features = ["git-test-support"] }
 proptest.workspace = true
 rstest.workspace = true
 tempfile = "3"

crates/gossip-scanner-runtime/Cargo.toml

@@ -80,7 +80,7 @@ use crate::{
     git_persistence::{GitPersistenceBackend, GitPersistenceOp},
     join_scoped,
     ordered_content::OrderedContentSkipReason,
-    test_fixtures::{init_git_repo, run_git_in},
+    test_fixtures::{init_git_repo, run_git},
 };
 
 // ============================================================================
@@ -459,9 +459,9 @@ pub(super) fn create_git_repo_fixture_with_secret_history(
         let filename = format!("secret-{commit}.txt");
         let contents = format!("{}\ncommit-{commit}\n", secret_fixture());
         fs::write(dir.path().join(&filename), contents).expect("write fixture");
-        run_git_in(dir.path(), &["add", "."]);
+        run_git(dir.path(), &["add", "."]);
         let message = format!("fixture-{commit}");
-        run_git_in(dir.path(), &["commit", "-q", "-m", message.as_str()]);
+        run_git(dir.path(), &["commit", "-q", "-m", message.as_str()]);
     }
 
     dir
@@ -476,8 +476,8 @@ pub(super) fn create_clean_git_repo_fixture() -> tempfile::TempDir {
         "Distributed Runtime Tests",
     );
     fs::write(dir.path().join("readme.txt"), "hello world\n").expect("write fixture");
-    run_git_in(dir.path(), &["add", "."]);
-    run_git_in(dir.path(), &["commit", "-q", "-m", "fixture"]);
+    run_git(dir.path(), &["add", "."]);
+    run_git(dir.path(), &["commit", "-q", "-m", "fixture"]);
     dir
 }
 
@@ -898,8 +898,8 @@ pub(super) fn create_git_repo_fixture_with_corrupt_blob() -> tempfile::TempDir {
         "Distributed Runtime Tests",
     );
     fs::write(dir.path().join("secret.txt"), secret_fixture()).expect("write fixture");
-    run_git_in(dir.path(), &["add", "."]);
-    run_git_in(dir.path(), &["commit", "-q", "-m", "fixture"]);
+    run_git(dir.path(), &["add", "."]);
+    run_git(dir.path(), &["commit", "-q", "-m", "fixture"]);
 
     // Locate and corrupt the blob loose object. Walk .git/objects
     // fan-out directories looking for loose files, then use `git

crates/gossip-scanner-runtime/src/distributed/test_support.rs

@@ -561,7 +561,7 @@ fn classify_io_git_run_error(op: &str, path: &Path, err: &io::Error) -> GitRunEr
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::test_fixtures::{init_git_repo, run_git_in};
+    use crate::test_fixtures::{init_git_repo, run_git};
 
     use tempfile::tempdir;
 
@@ -642,12 +642,12 @@ mod tests {
         // Create a commit so `git gc` has objects to pack.
         let sentinel = repo_dir.path().join("sentinel.txt");
         fs::write(&sentinel, b"data").expect("write sentinel");
-        run_git_in(repo_dir.path(), &["add", "sentinel.txt"]);
-        run_git_in(
+        run_git(repo_dir.path(), &["add", "sentinel.txt"]);
+        run_git(
             repo_dir.path(),
             &["-c", "gc.auto=0", "commit", "-m", "seed"],
         );
-        run_git_in(repo_dir.path(), &["-c", "gc.auto=0", "repack", "-a", "-d"]);
+        run_git(repo_dir.path(), &["-c", "gc.auto=0", "repack", "-a", "-d"]);
 
         // Remove the commit-graph (if created) so preflight reports
         // `missing_commit_graph = true`.

crates/gossip-scanner-runtime/src/git_mirror.rs

@@ -29,7 +29,7 @@ use crate::{
         CommitProgressRecord, CoordinationEventRecorder, StageSignal, StoredGitEvent,
     },
     distributed::{DistributedPersistence, DistributedRuntimeConfig, WorkerIdentity, run_worker},
-    test_fixtures::{init_git_repo, run_git_in},
+    test_fixtures::{init_git_repo, run_git},
 };
 
 fn create_test_repo(files: &[(&str, &[u8])]) -> tempfile::TempDir {
@@ -49,8 +49,8 @@ fn create_test_repo(files: &[(&str, &[u8])]) -> tempfile::TempDir {
     }
 
     if !files.is_empty() {
-        run_git_in(dir.path(), &["add", "."]);
-        run_git_in(dir.path(), &["commit", "-q", "-m", "fixture"]);
+        run_git(dir.path(), &["add", "."]);
+        run_git(dir.path(), &["commit", "-q", "-m", "fixture"]);
     }
 
     dir
@@ -1344,7 +1344,7 @@ fn scan_git_with_perf_debug_handles_empty_pack_exec_reports() {
     // empty-vector path in format_git_debug_output's Perf branch.
     let repo = create_test_repo(&[]);
     // Create an empty commit so the repo has at least one ref.
-    run_git_in(
+    run_git(
         repo.path(),
         &["commit", "-q", "--allow-empty", "-m", "empty"],
     );

crates/gossip-scanner-runtime/src/lib_tests.rs

@@ -3,9 +3,6 @@
 //! This module centralizes reusable test data builders and git repository
 //! setup helpers so runtime test modules share one command/assertion path.
 
-use std::path::Path;
-use std::process::Command;
-
 #[cfg(test)]
 use gossip_contracts::{
     connector::{Cursor, ItemKey, ItemRef, Location, ScanItem, VersionId},
@@ -24,6 +21,8 @@ use crate::{
     result_translation::{ItemResult, PersistenceTranslation, ScanTiming, translate_item_result},
 };
 
+pub use gossip_stdx::git_test_support::{git_stdout, init_git_repo, run_git};
+
 #[cfg(test)]
 pub(crate) fn test_rule_fingerprint(rule_id: u32) -> RuleFingerprint {
     let name = format!("test-rule-{rule_id}");
@@ -51,63 +50,6 @@ pub(crate) fn write_context_with_epoch(fence_epoch_raw: u64) -> WriteContext {
     )
 }
 
-/// Run `git` inside `dir`, assert the command succeeds, and return the raw
-/// process output. Both [`run_git_in`] and [`run_git_in_stdout`] delegate here.
-fn assert_git_output(dir: &Path, args: &[&str]) -> std::process::Output {
-    let output = Command::new("git")
-        .arg("-C")
-        .arg(dir)
-        .args(args)
-        .output()
-        .unwrap_or_else(|e| {
-            panic!(
-                "failed to spawn git -C {} {}: {e}",
-                dir.display(),
-                args.join(" "),
-            )
-        });
-    assert!(
-        output.status.success(),
-        "git command failed: git -C {} {}\nstdout:{}\nstderr:{}",
-        dir.display(),
-        args.join(" "),
-        String::from_utf8_lossy(&output.stdout),
-        String::from_utf8_lossy(&output.stderr),
-    );
-    output
-}
-
-/// Run `git` inside `dir` and assert the command succeeds.
-pub fn run_git_in(dir: &Path, args: &[&str]) {
-    assert_git_output(dir, args);
-}
-
-/// Run `git` inside `dir`, assert success, and return trimmed stdout.
-pub fn run_git_in_stdout(dir: &Path, args: &[&str]) -> String {
-    let output = assert_git_output(dir, args);
-    String::from_utf8(output.stdout)
-        .unwrap_or_else(|e| {
-            panic!(
-                "git -C {} {} produced non-UTF-8 stdout: {e}",
-                dir.display(),
-                args.join(" "),
-            )
-        })
-        .trim()
-        .to_owned()
-}
-
-/// Initialize a git repository with the configured author identity.
-///
-/// The `-b main` flag ensures the initial branch is always `main` regardless
-/// of the host's `init.defaultBranch` setting, making callers portable across
-/// git configurations.
-pub fn init_git_repo(dir: &Path, email: &str, name: &str) {
-    run_git_in(dir, &["init", "-q", "-b", "main"]);
-    run_git_in(dir, &["config", "user.email", email]);
-    run_git_in(dir, &["config", "user.name", name]);
-}
-
 #[cfg(test)]
 pub(crate) fn timing() -> ScanTiming {
     timing_with_offset(0)