From 297e8991efaf35a6a7a80eb47e5a960d66bcd407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Misty=20De=20M=C3=A9o?= <misty@axo.dev>
Date: Tue, 27 Aug 2024 16:26:42 -0700
Subject: [PATCH] tests: avoid modifying PATH outside CI

`cargo test` outside CI would end up adding the temporary
directory persistently to user's real dotfiles. Leave this on
in CI because it doesn't hurt anything there.

NOTE: this environment variable isn't supported on Windows at the
moment - we should probably try to unify that behaviour.

Refs https://github.com/axodotdev/cargo-dist/issues/1374.
---
 axoupdater-cli/tests/integration.rs | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/axoupdater-cli/tests/integration.rs b/axoupdater-cli/tests/integration.rs
index 34bfffa..dc12a8d 100644
--- a/axoupdater-cli/tests/integration.rs
+++ b/axoupdater-cli/tests/integration.rs
@@ -104,6 +104,10 @@ fn test_upgrade() -> std::io::Result<()> {
 
     let mut updater = Cmd::new(&updater_path, "run updater");
     updater.env("AXOUPDATER_CONFIG_PATH", bindir);
+    // If we're not running in CI, try to avoid ruining the user's PATH.
+    if std::env::var("CI").is_err() {
+        updater.env("INSTALLER_NO_MODIFY_PATH", "1");
+    }
     // We'll do that manually
     updater.check(false);
     let res = updater.output().unwrap();
@@ -156,6 +160,10 @@ fn test_upgrade_allow_prerelease() -> std::io::Result<()> {
     std::fs::copy(BIN, &updater_path)?;
 
     let mut updater = Cmd::new(&updater_path, "run updater");
+    // If we're not running in CI, try to avoid ruining the user's PATH.
+    if std::env::var("CI").is_err() {
+        updater.env("INSTALLER_NO_MODIFY_PATH", "1");
+    }
     updater.env("AXOUPDATER_CONFIG_PATH", bindir);
     updater.arg("--prerelease");
     // We'll do that manually
@@ -215,6 +223,10 @@ fn test_upgrade_to_specific_version() -> std::io::Result<()> {
     let mut updater = Cmd::new(&updater_path, "run updater");
     updater.arg("--version").arg(target_version);
     updater.env("AXOUPDATER_CONFIG_PATH", bindir);
+    // If we're not running in CI, try to avoid ruining the user's PATH.
+    if std::env::var("CI").is_err() {
+        updater.env("INSTALLER_NO_MODIFY_PATH", "1");
+    }
     // We'll do that manually
     updater.check(false);
     let _res = updater.output().unwrap();
@@ -264,6 +276,10 @@ fn test_downgrade_to_specific_version() -> std::io::Result<()> {
     let mut updater = Cmd::new(&updater_path, "run updater");
     updater.arg("--version").arg(target_version);
     updater.env("AXOUPDATER_CONFIG_PATH", bindir);
+    // If we're not running in CI, try to avoid ruining the user's PATH.
+    if std::env::var("CI").is_err() {
+        updater.env("INSTALLER_NO_MODIFY_PATH", "1");
+    }
     // We'll do that manually
     updater.check(false);
     let _res = updater.output().unwrap();
@@ -326,6 +342,10 @@ fn test_downgrade_to_specific_old_version() -> std::io::Result<()> {
     let mut updater = Cmd::new(&updater_path, "run updater");
     updater.arg("--version").arg(target_version);
     updater.env("AXOUPDATER_CONFIG_PATH", bindir);
+    // If we're not running in CI, try to avoid ruining the user's PATH.
+    if std::env::var("CI").is_err() {
+        updater.env("INSTALLER_NO_MODIFY_PATH", "1");
+    }
     // This installer is so old it doesn't respect the install path, so we
     // have to set CARGO_HOME to force it.
     updater.env("CARGO_HOME", tempdir.path());
@@ -381,6 +401,10 @@ fn test_upgrade_from_prefix_with_no_bin() -> std::io::Result<()> {
 
     let mut updater = Cmd::new(&updater_path, "run updater");
     updater.env("AXOUPDATER_CONFIG_PATH", prefix);
+    // If we're not running in CI, try to avoid ruining the user's PATH.
+    if std::env::var("CI").is_err() {
+        updater.env("INSTALLER_NO_MODIFY_PATH", "1");
+    }
     // We'll do that manually
     updater.check(false);
     let res = updater.output().unwrap();