patched os dictionary so that is clears it before every test and then additively adds environments for every fake environment

Author: sfc-gh-sshetkar

test/csp_helpers.py

@@ -130,6 +130,8 @@ def __enter__(self):
                 side_effect=ConnectTimeout(),
             )
         )
+        # Patch the environment variables to fake the metadata service
+        # Note that this doesn't clear, so it's additive to the existing environment.
         self.patchers.append(patch.dict(os.environ, self.get_environment_variables()))
         for patcher in self.patchers:
             patcher.__enter__()

test/unit/test_detect_platforms.py

@@ -1,5 +1,8 @@
 from __future__ import annotations
 
+import os
+from unittest.mock import patch
+
 import pytest
 
 from snowflake.connector.platform_detection import detect_platforms
@@ -14,10 +17,12 @@ def build_response(status_code=200, headers=None):
 
 
 class TestDetectPlatforms:
-    # TODO: add this back probably once I verify caching is causing the test failures
-    # @pytest.fixture(autouse=True)
-    # def teardown(self):
-    #     yield
+    @pytest.fixture(autouse=True)
+    def teardown(self):
+        with patch.dict(os.environ, clear=True):
+            yield
+
+    #     TODO: add this back probably once I verify caching is causing the test failures
     #     detect_platforms.cache_clear()  # clear cache after each test
 
     def test_no_platforms_detected(self, broken_metadata_service):