@@ -415,15 +415,17 @@ def test_environment_variables_logs(session: Session, caplog: pytest.LogCaptureF
415
415
sum (
416
416
1
417
417
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
419
419
)
420
420
# From both_overrides_in_first_pane.
421
421
== 1
422
422
)
423
423
424
424
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" )
427
429
workspace = ConfigReader ._from_file (
428
430
test_utils .get_workspace_file ("workspace/builder/window_automatic_rename.yaml" )
429
431
)
@@ -434,42 +436,29 @@ def test_automatic_rename_option(session):
434
436
if " " in portable_command :
435
437
portable_command = portable_command .split (" " )[0 ]
436
438
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
454
444
455
- assert session .name != "tmuxp"
456
- w = session .windows [0 ]
445
+ assert w .name != "renamed_window"
457
446
458
447
def check_window_name_mismatch () -> bool :
459
- session .server ._update_windows ()
448
+ w .server ._update_windows ()
460
449
return w .name != portable_command
461
450
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 )
466
452
467
453
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
470
459
471
460
assert retry_until (
472
- check_window_name_match , 2 , interval = 0.25
461
+ check_window_name_match , 4 , interval = 0.05
473
462
), f"Window name { w .name } should be { portable_command } "
474
463
475
464
w .select_pane ("-D" )
0 commit comments