!squash test load.py

Author: tony

tests/cli/test_load.py

@@ -209,81 +209,6 @@ class CLILoadFixture(t.NamedTuple):
     expected_not_in_err: ExpectedOutput = None
 
 
-class ZshAutotitleTestFixture(t.NamedTuple):
-    """Test fixture for zsh auto title warning tests."""
-
-    test_id: str
-    cli_args: list[str]
-
-
-class LogFileTestFixture(t.NamedTuple):
-    """Test fixture for log file tests."""
-
-    test_id: str
-    cli_args: list[str]
-
-
-class PluginVersionTestFixture(t.NamedTuple):
-    """Test fixture for plugin version tests."""
-
-    test_id: str
-    cli_args: list[str]
-    inputs: list[str]
-
-
-class PluginMissingTestFixture(t.NamedTuple):
-    """Test fixture for plugin missing tests."""
-
-    test_id: str
-    cli_args: list[str]
-
-
-ZSH_AUTOTITLE_TEST_FIXTURES: list[ZshAutotitleTestFixture] = [
-    ZshAutotitleTestFixture(
-        test_id="load_dot_detached",
-        cli_args=["load", ".", "-d"],
-    ),
-    ZshAutotitleTestFixture(
-        test_id="load_yaml_detached",
-        cli_args=["load", ".tmuxp.yaml", "-d"],
-    ),
-]
-
-
-LOG_FILE_TEST_FIXTURES: list[LogFileTestFixture] = [
-    LogFileTestFixture(
-        test_id="load_with_log_file",
-        cli_args=["load", ".", "--log-file", "log.txt", "-d"],
-    ),
-]
-
-
-PLUGIN_VERSION_SKIP_TEST_FIXTURES: list[PluginVersionTestFixture] = [
-    PluginVersionTestFixture(
-        test_id="skip_version_fail",
-        cli_args=["load", "tests/fixtures/workspace/builder/plugin_versions_fail.yaml"],
-        inputs=["y\n"],
-    ),
-]
-
-
-PLUGIN_VERSION_NO_SKIP_TEST_FIXTURES: list[PluginVersionTestFixture] = [
-    PluginVersionTestFixture(
-        test_id="no_skip_version_fail",
-        cli_args=["load", "tests/fixtures/workspace/builder/plugin_versions_fail.yaml"],
-        inputs=["n\n"],
-    ),
-]
-
-
-PLUGIN_MISSING_TEST_FIXTURES: list[PluginMissingTestFixture] = [
-    PluginMissingTestFixture(
-        test_id="missing_plugin",
-        cli_args=["load", "tests/fixtures/workspace/builder/plugin_missing_fail.yaml"],
-    ),
-]
-
-
 TEST_LOAD_FIXTURES: list[CLILoadFixture] = [
     CLILoadFixture(
         test_id="dir-relative-dot-samedir",
@@ -434,6 +359,25 @@ def test_regression_00132_session_name_with_dots(
         cli.cli(["load", *cli_args])
 
 
+class ZshAutotitleTestFixture(t.NamedTuple):
+    """Test fixture for zsh auto title warning tests."""
+
+    test_id: str
+    cli_args: list[str]
+
+
+ZSH_AUTOTITLE_TEST_FIXTURES: list[ZshAutotitleTestFixture] = [
+    ZshAutotitleTestFixture(
+        test_id="load_dot_detached",
+        cli_args=["load", ".", "-d"],
+    ),
+    ZshAutotitleTestFixture(
+        test_id="load_yaml_detached",
+        cli_args=["load", ".tmuxp.yaml", "-d"],
+    ),
+]
+
+
 @pytest.mark.parametrize(
     list(ZshAutotitleTestFixture._fields),
     ZSH_AUTOTITLE_TEST_FIXTURES,
@@ -494,6 +438,21 @@ def test_load_zsh_autotitle_warning(
     assert "Please set" not in result.out
 
 
+class LogFileTestFixture(t.NamedTuple):
+    """Test fixture for log file tests."""
+
+    test_id: str
+    cli_args: list[str]
+
+
+LOG_FILE_TEST_FIXTURES: list[LogFileTestFixture] = [
+    LogFileTestFixture(
+        test_id="load_with_log_file",
+        cli_args=["load", ".", "--log-file", "log.txt", "-d"],
+    ),
+]
+
+
 @pytest.mark.parametrize(
     list(LogFileTestFixture._fields),
     LOG_FILE_TEST_FIXTURES,
@@ -555,6 +514,23 @@ def test_load_plugins(
         assert plugin.__class__ in test_plugin_class_types
 
 
+class PluginVersionTestFixture(t.NamedTuple):
+    """Test fixture for plugin version tests."""
+
+    test_id: str
+    cli_args: list[str]
+    inputs: list[str]
+
+
+PLUGIN_VERSION_SKIP_TEST_FIXTURES: list[PluginVersionTestFixture] = [
+    PluginVersionTestFixture(
+        test_id="skip_version_fail",
+        cli_args=["load", "tests/fixtures/workspace/builder/plugin_versions_fail.yaml"],
+        inputs=["y\n"],
+    ),
+]
+
+
 @pytest.mark.skip("Not sure how to clean up the tmux session this makes")
 @pytest.mark.parametrize(
     list(PluginVersionTestFixture._fields),
@@ -577,6 +553,15 @@ def test_load_plugins_version_fail_skip(
     assert "[Loading]" in result.out
 
 
+PLUGIN_VERSION_NO_SKIP_TEST_FIXTURES: list[PluginVersionTestFixture] = [
+    PluginVersionTestFixture(
+        test_id="no_skip_version_fail",
+        cli_args=["load", "tests/fixtures/workspace/builder/plugin_versions_fail.yaml"],
+        inputs=["n\n"],
+    ),
+]
+
+
 @pytest.mark.parametrize(
     list(PluginVersionTestFixture._fields),
     PLUGIN_VERSION_NO_SKIP_TEST_FIXTURES,
@@ -601,6 +586,21 @@ def test_load_plugins_version_fail_no_skip(
     assert "[Not Skipping]" in result.out
 
 
+class PluginMissingTestFixture(t.NamedTuple):
+    """Test fixture for plugin missing tests."""
+
+    test_id: str
+    cli_args: list[str]
+
+
+PLUGIN_MISSING_TEST_FIXTURES: list[PluginMissingTestFixture] = [
+    PluginMissingTestFixture(
+        test_id="missing_plugin",
+        cli_args=["load", "tests/fixtures/workspace/builder/plugin_missing_fail.yaml"],
+    ),
+]
+
+
 @pytest.mark.parametrize(
     list(PluginMissingTestFixture._fields),
     PLUGIN_MISSING_TEST_FIXTURES,