!squash test workaround

Author: tony

tests/test_workspacebuilder.py

@@ -1223,15 +1223,42 @@ def is_almost_equal(x, y):
     assert is_almost_equal(width(panes[0]), width(panes[1]))
 
 
-@pytest.mark.skipif(has_lt_version("2.9"), reason="default-size only applies there")
+class DefaultSizeNamespaceFixture(t.NamedTuple):
+    test_id: str
+    TMUXP_DEFAULT_SIZE: t.Optional[str]
+    raises: bool
+    confoverrides: t.Dict[str, t.Any]
+
+
+DEFAULT_SIZE_FIXTURES = [
+    DefaultSizeNamespaceFixture(
+        test_id="v1.13.1 default-size-breaks",
+        TMUXP_DEFAULT_SIZE=None,
+        raises=True,
+        confoverrides={},
+    ),
+    DefaultSizeNamespaceFixture(
+        test_id="v1.13.1-option-workaround",
+        TMUXP_DEFAULT_SIZE=None,
+        raises=False,
+        confoverrides={"options": {"default-size": "800x600"}},
+    ),
+]
+
+
 @pytest.mark.parametrize(
-    "TMUXP_DEFAULT_SIZE,raises", [[None, True], ["800x600", False]]
+    DefaultSizeNamespaceFixture._fields,
+    DEFAULT_SIZE_FIXTURES,
+    ids=[f.test_id for f in DEFAULT_SIZE_FIXTURES],
 )
+@pytest.mark.skipif(has_lt_version("2.9"), reason="default-size only applies there")
 def test_issue_800_default_size_many_windows(
     server: "Server",
     monkeypatch: pytest.MonkeyPatch,
+    test_id: str,
     TMUXP_DEFAULT_SIZE: t.Optional[str],
     raises: bool,
+    confoverrides: t.Dict[str, t.Any],
 ) -> None:
     """Recreate default-size issue.
 
@@ -1248,6 +1275,10 @@ def test_issue_800_default_size_many_windows(
     sconfig = config.expand(sconfig)
     sconfig = config.trickle(sconfig)
 
+    if isinstance(confoverrides, dict):
+        for k, v in confoverrides.items():
+            sconfig[k] = v
+
     if TMUXP_DEFAULT_SIZE is not None:
         monkeypatch.setenv("TMUXP_DEFAULT_SIZE", TMUXP_DEFAULT_SIZE)