SNOW-2306184: config refactor - track resolution history only when requested - fix win tests

Author: sfc-gh-mraba

tests/config_ng/conftest.py

@@ -20,6 +20,7 @@
 
 import copy
 import os
+import os.path
 import tempfile
 from contextlib import contextmanager
 from pathlib import Path
@@ -60,6 +61,36 @@ def _temp_environment(env_vars: Dict[str, str]):
         os.environ.update(original_env)
 
 
+@pytest.fixture
+def windows_home_env(tmp_path) -> Dict[str, str]:
+    """
+    Provide temporary Windows-specific home environment variables when needed.
+
+    Returns an empty dict on non-Windows platforms to avoid polluting tests.
+    """
+
+    if not IS_WINDOWS:
+        return {}
+
+    home_dir = tmp_path / "win_home"
+    home_dir.mkdir()
+
+    snowflake_home = home_dir / ".snowflake"
+    snowflake_home.mkdir()
+
+    resolved_home = home_dir.resolve()
+    drive, tail = os.path.splitdrive(str(resolved_home))
+    homedrive = drive or os.environ.get("HOMEDRIVE", "C:")
+    homepath = tail or os.environ.get("HOMEPATH", "\\")
+
+    return {
+        "SNOWFLAKE_HOME": str(snowflake_home),
+        "USERPROFILE": str(resolved_home),
+        "HOMEDRIVE": homedrive,
+        "HOMEPATH": homepath,
+    }
+
+
 @pytest.fixture
 def config_ng_setup():
     """

tests/config_ng/test_resolution_logger.py

@@ -354,14 +354,17 @@ def test_check_value_source_for_env_var(self):
 class TestConfigurationExplanationResults:
     """Tests for get_configuration_explanation_results helper."""
 
-    @mock.patch.dict(os.environ, {ALTERNATIVE_CONFIG_ENV_VAR: "1"}, clear=True)
     @mock.patch("snowflake.cli.api.config_ng.resolution_logger.ResolutionPresenter")
     @mock.patch("snowflake.cli.api.config_ng.resolution_logger.get_resolver")
     @mock.patch(
         "snowflake.cli.api.config_ng.resolution_logger.get_config_provider_singleton"
     )
     def test_includes_diagnostics_message_non_verbose(
-        self, mock_provider, mock_get_resolver, mock_presenter_cls
+        self,
+        mock_provider,
+        mock_get_resolver,
+        mock_presenter_cls,
+        windows_home_env,
     ):
         from snowflake.cli.api.output.types import (
             CollectionResult,
@@ -377,19 +380,24 @@ def test_includes_diagnostics_message_non_verbose(
         table_result = CollectionResult([])
         presenter.build_sources_table.return_value = table_result
 
-        result = get_configuration_explanation_results(verbose=False)
+        env_vars = {ALTERNATIVE_CONFIG_ENV_VAR: "1", **windows_home_env}
+        with mock.patch.dict(os.environ, env_vars, clear=True):
+            result = get_configuration_explanation_results(verbose=False)
         assert isinstance(result, MultipleResults)
         outputs = list(result.result)
         assert outputs == [diag_message, table_result]
 
-    @mock.patch.dict(os.environ, {ALTERNATIVE_CONFIG_ENV_VAR: "1"}, clear=True)
     @mock.patch("snowflake.cli.api.config_ng.resolution_logger.ResolutionPresenter")
     @mock.patch("snowflake.cli.api.config_ng.resolution_logger.get_resolver")
     @mock.patch(
         "snowflake.cli.api.config_ng.resolution_logger.get_config_provider_singleton"
     )
     def test_includes_diagnostics_message_verbose(
-        self, mock_provider, mock_get_resolver, mock_presenter_cls
+        self,
+        mock_provider,
+        mock_get_resolver,
+        mock_presenter_cls,
+        windows_home_env,
     ):
         from snowflake.cli.api.output.types import (
             CollectionResult,
@@ -408,7 +416,9 @@ def test_includes_diagnostics_message_verbose(
         presenter.build_sources_table.return_value = table_result
         presenter.format_history_message.return_value = history_message
 
-        result = get_configuration_explanation_results(verbose=True)
+        env_vars = {ALTERNATIVE_CONFIG_ENV_VAR: "1", **windows_home_env}
+        with mock.patch.dict(os.environ, env_vars, clear=True):
+            result = get_configuration_explanation_results(verbose=True)
         assert isinstance(result, MultipleResults)
         outputs = list(result.result)
         assert outputs == [diag_message, table_result, history_message]