Skip to content

Commit 00827d3

Browse files
authored
test(automatic rename): Fix renaming (#853)
2 parents 59d6457 + 35c3e28 commit 00827d3

File tree

3 files changed

+26
-31
lines changed

3 files changed

+26
-31
lines changed

CHANGES

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ $ pipx install --suffix=@next 'tmuxp' --pip-args '\--pre' --force
1919

2020
<!-- Maintainers, insert changes / features for the next release here -->
2121

22+
### Developmental
23+
24+
- Tests: Stabilization fix for automatic rename test (#853)
25+
2226
## tmuxp 1.19.1 (2022-12-12)
2327

2428
### Fixes

tests/fixtures/workspace/builder/window_automatic_rename.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
session_name: test window options
22
start_directory: '~'
33
windows:
4-
- layout: main-horizontal
4+
- window_name: renamed_window
5+
layout: main-horizontal
56
options:
67
automatic-rename: on
78
panes:
89
- shell_command:
910
- cmd: man ls
1011
start_directory: '~'
12+
focus: true
1113
- shell_command:
1214
- cmd: echo "hey"
1315
- shell_command:

tests/workspace/test_builder.py

+19-30
Original file line numberDiff line numberDiff line change
@@ -415,15 +415,17 @@ def test_environment_variables_logs(session: Session, caplog: pytest.LogCaptureF
415415
sum(
416416
1
417417
for record in caplog.records
418-
if 'Cannot set environment for new panes and windows.' in record.msg
418+
if "Cannot set environment for new panes and windows." in record.msg
419419
)
420420
# From both_overrides_in_first_pane.
421421
== 1
422422
)
423423

424424

425-
def test_automatic_rename_option(session):
426-
"""With option automatic-rename: on."""
425+
def test_automatic_rename_option(
426+
server: "Server", monkeypatch: pytest.MonkeyPatch
427+
) -> None:
428+
monkeypatch.setenv("DISABLE_AUTO_TITLE", "true")
427429
workspace = ConfigReader._from_file(
428430
test_utils.get_workspace_file("workspace/builder/window_automatic_rename.yaml")
429431
)
@@ -434,42 +436,29 @@ def test_automatic_rename_option(session):
434436
if " " in portable_command:
435437
portable_command = portable_command.split(" ")[0]
436438

437-
builder = WorkspaceBuilder(sconf=workspace)
438-
439-
window_count = len(session._windows) # current window count
440-
assert len(session._windows) == window_count
441-
for w, wconf in builder.iter_create_windows(session):
442-
443-
for p in builder.iter_create_panes(w, wconf):
444-
w.select_layout("tiled") # fix glitch with pane size
445-
p = p
446-
assert len(session._windows), window_count
447-
assert isinstance(w, Window)
448-
assert w.show_window_option("automatic-rename") == "on"
449-
450-
assert len(session._windows) == window_count
451-
452-
window_count += 1
453-
w.select_layout(wconf["layout"])
439+
builder = WorkspaceBuilder(sconf=workspace, server=server)
440+
builder.build()
441+
session: Session = builder.session
442+
w: Window = session.windows[0]
443+
assert len(session.windows) == 1
454444

455-
assert session.name != "tmuxp"
456-
w = session.windows[0]
445+
assert w.name != "renamed_window"
457446

458447
def check_window_name_mismatch() -> bool:
459-
session.server._update_windows()
448+
w.server._update_windows()
460449
return w.name != portable_command
461450

462-
assert retry_until(check_window_name_mismatch, 2, interval=0.25)
463-
464-
pane_base_index = w.show_window_option("pane-base-index", g=True)
465-
w.select_pane(pane_base_index)
451+
assert retry_until(check_window_name_mismatch, 5, interval=0.25)
466452

467453
def check_window_name_match() -> bool:
468-
session.server._update_windows()
469-
return w.name == portable_command
454+
w.server._update_windows()
455+
assert w.show_window_option("automatic-rename") == "on"
456+
457+
print(f"w.name: {w.name} and portable_command: {portable_command}")
458+
return w.name == "zsh" or w.name == portable_command
470459

471460
assert retry_until(
472-
check_window_name_match, 2, interval=0.25
461+
check_window_name_match, 4, interval=0.05
473462
), f"Window name {w.name} should be {portable_command}"
474463

475464
w.select_pane("-D")

0 commit comments

Comments
 (0)