KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make fish shell integration test for XDG_DATA_DIRS work even if the shells rc files add to XDG_DATA_DIRS.

Browse Source 
My Linux distro has now started installing system wide rc files that do
this :((
This commit is contained in:
Kovid Goyal 2022-08-28 20:45:29 +05:30
parent fba759a47c
commit 43b2935e52
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kitty_tests/shell_integration.py
View File

@ -11,7 +11,7 @@ import unittest
from contextlib import contextmanager from contextlib import contextmanager
from functools import lru_cache, partial from functools import lru_cache, partial
from kitty.constants import kitty_base_dir, terminfo_dir from kitty.constants import kitty_base_dir, terminfo_dir, shell_integration_dir
from kitty.fast_data_types import CURSOR_BEAM, CURSOR_BLOCK, CURSOR_UNDERLINE from kitty.fast_data_types import CURSOR_BEAM, CURSOR_BLOCK, CURSOR_UNDERLINE
from kitty.shell_integration import ( from kitty.shell_integration import (
setup_bash_env, setup_fish_env, setup_zsh_env setup_bash_env, setup_fish_env, setup_zsh_env
@ -174,10 +174,9 @@ function _set_status_prompt; function fish_prompt; echo -n "$pipestatus $status
pty.wait_till(lambda: pty.screen_contents().count(right_prompt) == 1) pty.wait_till(lambda: pty.screen_contents().count(right_prompt) == 1)
self.ae(pty.screen_contents(), q) self.ae(pty.screen_contents(), q)
# XDG_DATA_DIRS # shell integration dir must no be in XDG_DATA_DIRS
pty.send_cmd_to_child('set -q XDG_DATA_DIRS; or echo ok') pty.send_cmd_to_child(f'string match -q -- "*{shell_integration_dir}*" "$XDG_DATA_DIRS" || echo "XDD_OK"')
pty.wait_till(lambda: pty.screen_contents().count(right_prompt) == 2) pty.wait_till(lambda: 'XDD_OK' in pty.screen_contents())
self.ae(str(pty.screen.line(1)), 'ok')
# CWD reporting # CWD reporting
self.assertTrue(pty.screen.last_reported_cwd.endswith(self.home_dir)) self.assertTrue(pty.screen.last_reported_cwd.endswith(self.home_dir))