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

Fix the ssh_copy test on macOS

Browse Source
This commit is contained in:
Kovid Goyal 2022-03-04 21:31:13 +05:30
parent 9e82397de9
commit 0c79561977
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kitty_tests/ssh.py
View File

@ -2,6 +2,7 @@
# License: GPLv3 Copyright: 2021, Kovid Goyal <kovid at kovidgoyal.net> # License: GPLv3 Copyright: 2021, Kovid Goyal <kovid at kovidgoyal.net>
import glob
import os import os
import shlex import shlex
import shutil import shutil
@ -111,9 +112,12 @@ copy --exclude */w.* d1
sh, remote_home, extra_exec='env; exit 0', SHELL_INTEGRATION_VALUE='', sh, remote_home, extra_exec='env; exit 0', SHELL_INTEGRATION_VALUE='',
ssh_opts={'copy': copy} ssh_opts={'copy': copy}
) )
self.assertTrue(os.path.lexists(f'{remote_home}/.terminfo/78')) tname = '.terminfo'
self.assertTrue(os.path.exists(f'{remote_home}/.terminfo/78/xterm-kitty')) if os.path.exists('/usr/share/misc/terminfo.cdb'):
self.assertTrue(os.path.exists(f'{remote_home}/.terminfo/x/xterm-kitty')) tname += '.cdb'
self.assertTrue(os.path.lexists(f'{remote_home}/{tname}/78'))
self.assertTrue(os.path.exists(f'{remote_home}/{tname}/78/xterm-kitty'))
self.assertTrue(os.path.exists(f'{remote_home}/{tname}/x/xterm-kitty'))
for w in ('simple-file', 'a/sfa'): for w in ('simple-file', 'a/sfa'):
with open(os.path.join(remote_home, w), 'r') as f: with open(os.path.join(remote_home, w), 'r') as f:
self.ae(f.read(), simple_data) self.ae(f.read(), simple_data)
@ -122,10 +126,14 @@ copy --exclude */w.* d1
self.ae(os.readlink(f'{remote_home}/d1/y'), 'd2/x') self.ae(os.readlink(f'{remote_home}/d1/y'), 'd2/x')
contents = set(files_in(remote_home)) contents = set(files_in(remote_home))
contents.discard('.zshrc') # added by check_bootstrap() contents.discard('.zshrc') # added by check_bootstrap()
# depending on platform one of these is a symlink and hence
# isnt in contents
contents.discard(f'{tname}/x/xterm-kitty')
contents.discard(f'{tname}/78/xterm-kitty')
self.ae(contents, { self.ae(contents, {
'g.1', 'g.2', '.terminfo/kitty.terminfo', 'simple-file', '.terminfo/x/xterm-kitty', 'd1/d2/x', 'd1/y', 'g.1', 'g.2', f'{tname}/kitty.terminfo', 'simple-file', 'd1/d2/x', 'd1/y', 'a/sfa'
'a/sfa'
}) })
self.ae(len(glob.glob(f'{remote_home}/{tname}/*/xterm-kitty')), 2)
def test_ssh_env_vars(self): def test_ssh_env_vars(self):
for sh in self.all_possible_sh: for sh in self.all_possible_sh: