From 1c7dde67808a8127c1d03c29ff40a7ccea7eb9cd Mon Sep 17 00:00:00 2001 From: Maarten de Vries Date: Wed, 13 Dec 2023 19:14:12 +0100 Subject: [PATCH] Do not rely on local repo having test branches. --- git-version/tests/version.rs | 38 +++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/git-version/tests/version.rs b/git-version/tests/version.rs index 1f0ab76..911484b 100644 --- a/git-version/tests/version.rs +++ b/git-version/tests/version.rs @@ -28,19 +28,47 @@ fn test_in_external_clone() { let target_dir = target_dir.join("tests_target"); let_assert!(Ok(result) = std::process::Command::new("git") - .arg("-c") - .arg("protocol.file.allow=always") .arg("clone") .arg("--quiet") - .arg("--recurse-submodules") - .arg("-b") - .arg("test-root") .arg((lib_dir).join("..")) .arg(tempdir.path()) .status() ); assert!(result.success(), "git clone: {result}"); + let_assert!(Ok(result) = std::process::Command::new("git") + .current_dir(&tempdir) + .arg("-c") + .arg("protocol.file.allow=always") + .arg("fetch") + .arg("--quiet") + .arg("origin") + .arg("+refs/remotes/origin/test-*:refs/heads/test-*") + .status() + ); + assert!(result.success(), "git fetch: {result}"); + + let_assert!(Ok(result) = std::process::Command::new("git") + .current_dir(&tempdir) + .arg("switch") + .arg("--quiet") + .arg("test-root") + .status() + ); + assert!(result.success(), "git fetch: {result}"); + + let_assert!(Ok(result) = std::process::Command::new("git") + .current_dir(&tempdir) + .arg("-c") + .arg("protocol.file.allow=always") + .arg("submodule") + .arg("--quiet") + .arg("update") + .arg("--init") + .status() + ); + assert!(result.success(), "git fetch: {result}"); + let_assert!(Ok(result) = std::process::Command::new("cargo") .current_dir(&tempdir) .arg("add")