SNOW-2306184: config refactor - cleanup 5

Author: sfc-gh-mraba

tests/conftest.py

@@ -89,31 +89,11 @@ def matches(
         )
 
 
-class ConfigModeSnapshotExtension(AmberSnapshotExtension):
-    """Snapshot extension that includes config mode in snapshot file name."""
-
-    @classmethod
-    def _get_file_basename(cls, *, test_location, index):
-        """Generate snapshot filename with config mode suffix."""
-        config_mode = (
-            "config_ng" if os.getenv("SNOWFLAKE_CLI_CONFIG_V2_ENABLED") else "legacy"
-        )
-        basename = super()._get_file_basename(test_location=test_location, index=index)
-        # Insert config mode before .ambr extension
-        return f"{basename}_{config_mode}"
-
-
 @pytest.fixture()
 def os_agnostic_snapshot(snapshot):
     return snapshot.use_extension(CustomSnapshotExtension)
 
 
-@pytest.fixture()
-def config_snapshot(snapshot):
-    """Config-mode-aware snapshot fixture for tests that differ between legacy and config_ng."""
-    return snapshot.use_extension(ConfigModeSnapshotExtension)
-
-
 @pytest.fixture(autouse=True)
 # Global context and logging levels reset is required.
 # Without it, state from previous tests is visible in following tests.

tests_common/__init__.py

@@ -17,3 +17,5 @@
 from tests_common.path_utils import *
 
 IS_WINDOWS = platform.system() == "Windows"
+
+__all__ = ["IS_WINDOWS", "ConfigModeSnapshotExtension", "config_snapshot"]

tests_common/conftest.py

@@ -23,6 +23,7 @@
 
 import pytest
 import yaml
+from syrupy.extensions.amber import AmberSnapshotExtension
 
 from snowflake.cli._plugins.streamlit.streamlit_entity import StreamlitEntity
 from snowflake.cli._plugins.streamlit.streamlit_entity_model import StreamlitEntityModel
@@ -144,3 +145,23 @@ def _update(snowflake_yml_path: Path, parameter_path: str, value=None):
     sys.version_info >= PYTHON_3_12,
     reason="requires python3.11 or lower",
 )
+
+
+class ConfigModeSnapshotExtension(AmberSnapshotExtension):
+    """Snapshot extension that includes config mode in snapshot file name."""
+
+    @classmethod
+    def _get_file_basename(cls, *, test_location, index):
+        """Generate snapshot filename with config mode suffix."""
+        config_mode = (
+            "config_ng" if os.getenv("SNOWFLAKE_CLI_CONFIG_V2_ENABLED") else "legacy"
+        )
+        basename = super()._get_file_basename(test_location=test_location, index=index)
+        # Insert config mode before .ambr extension
+        return f"{basename}_{config_mode}"
+
+
+@pytest.fixture()
+def config_snapshot(snapshot):
+    """Config-mode-aware snapshot fixture for tests that differ between legacy and config_ng."""
+    return snapshot.use_extension(ConfigModeSnapshotExtension)

tests_e2e/conftest.py

@@ -25,7 +25,6 @@
 from snowflake.cli import __about__
 from snowflake.cli.api.constants import PYTHON_3_12
 from snowflake.cli.api.secure_path import SecurePath
-from syrupy.extensions.amber import AmberSnapshotExtension
 
 from tests_common import IS_WINDOWS
 
@@ -36,26 +35,6 @@
 ]
 
 
-class ConfigModeSnapshotExtension(AmberSnapshotExtension):
-    """Snapshot extension that includes config mode in snapshot file name."""
-
-    @classmethod
-    def _get_file_basename(cls, *, test_location, index):
-        """Generate snapshot filename with config mode suffix."""
-        config_mode = (
-            "config_ng" if os.getenv("SNOWFLAKE_CLI_CONFIG_V2_ENABLED") else "legacy"
-        )
-        basename = super()._get_file_basename(test_location=test_location, index=index)
-        # Insert config mode before .ambr extension
-        return f"{basename}_{config_mode}"
-
-
-@pytest.fixture()
-def config_snapshot(snapshot):
-    """Config-mode-aware snapshot fixture for tests that differ between legacy and config_ng."""
-    return snapshot.use_extension(ConfigModeSnapshotExtension)
-
-
 def _clean_output(text: str):
     """
     Replacing util to clean up console output. Typer is using rich.Panel to show the --help content.

tests_integration/conftest.py

@@ -31,7 +31,6 @@
 
 import pytest
 import yaml
-from syrupy.extensions.amber import AmberSnapshotExtension
 from typer import Typer
 from typer.testing import CliRunner
 
@@ -56,26 +55,6 @@
 ]
 
 
-class ConfigModeSnapshotExtension(AmberSnapshotExtension):
-    """Snapshot extension that includes config mode in snapshot file name."""
-
-    @classmethod
-    def _get_file_basename(cls, *, test_location, index):
-        """Generate snapshot filename with config mode suffix."""
-        config_mode = (
-            "config_ng" if os.getenv("SNOWFLAKE_CLI_CONFIG_V2_ENABLED") else "legacy"
-        )
-        basename = super()._get_file_basename(test_location=test_location, index=index)
-        # Insert config mode before .ambr extension
-        return f"{basename}_{config_mode}"
-
-
-@pytest.fixture()
-def config_snapshot(snapshot):
-    """Config-mode-aware snapshot fixture for tests that differ between legacy and config_ng."""
-    return snapshot.use_extension(ConfigModeSnapshotExtension)
-
-
 TEST_DIR = Path(__file__).parent
 DEFAULT_TEST_CONFIG = "connection_configs.toml"
 WORLD_READABLE_CONFIG = "world_readable.toml"