Workspace(fix[importers]): Assert importer warnings on schema fields

tony · tony · commit 381e7a2a91d2 · 2026-06-07T08:19:24.000-05:00
why: The socket-override warning carried no structured fields and the
import tests matched message substrings against the logging
standards; the override message also used present tense for an event.
what:
- Add tmux_session extra to the socket-override warning and change
  "overrides" to "overrode"
- Assert the override and dropped-pane-key warnings via record extras
  and args instead of message text
diff --git a/src/tmuxp/workspace/importers.py b/src/tmuxp/workspace/importers.py
@@ -268,10 +268,15 @@ def import_tmuxinator(
                 and tmuxp_workspace[socket_key] != explicit_value
             ):
                 logger.warning(
-                    "explicit %s %s overrides tmux option value %s",
+                    "explicit %s %s overrode tmux option value %s",
                     socket_key,
                     explicit_value,
                     tmuxp_workspace[socket_key],
+                    extra={
+                        "tmux_session": str(
+                            tmuxp_workspace.get("session_name") or "",
+                        ),
+                    },
                 )
             tmuxp_workspace[socket_key] = explicit_value
 
diff --git a/tests/workspace/test_import_teamocil.py b/tests/workspace/test_import_teamocil.py
@@ -240,5 +240,15 @@ def test_import_teamocil_warns_and_drops_pane_dimensions(
         result = importers.import_teamocil(workspace)
 
     assert result["windows"][0]["panes"] == [{"shell_command": "vim"}]
-    assert any("width" in record.message for record in caplog.records)
-    assert any("height" in record.message for record in caplog.records)
+    dropped = [
+        record
+        for record in caplog.records
+        if record.levelno == logging.WARNING and hasattr(record, "tmux_window")
+    ]
+    dropped_keys = sorted(
+        str(record.args[0])
+        for record in dropped
+        if isinstance(record.args, tuple) and record.args
+    )
+    assert dropped_keys == ["height", "width"]
+    assert all(record.tmux_window == "main" for record in dropped)
diff --git a/tests/workspace/test_import_tmuxinator.py b/tests/workspace/test_import_tmuxinator.py
@@ -274,8 +274,14 @@ def test_import_tmuxinator_socket_name_conflict_warns(
         result = importers.import_tmuxinator(workspace)
 
     assert result["socket_name"] == "explicit"
-    assert any("explicit" in record.message for record in caplog.records)
-    assert any("from_cli" in record.message for record in caplog.records)
+    conflict_warnings = [
+        record
+        for record in caplog.records
+        if record.levelno == logging.WARNING and hasattr(record, "tmux_session")
+    ]
+    assert len(conflict_warnings) == 1
+    assert conflict_warnings[0].tmux_session == "conflict"
+    assert conflict_warnings[0].args == ("socket_name", "explicit", "from_cli")
 
 
 def test_import_tmuxinator_attached_tmux_flags() -> None:
