From 47913a7c1fe2a21ea8453314ba1435ce62969f50 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 26 Jul 2023 11:09:10 +0530 Subject: [PATCH] Tests for normal mode home dir expansion --- kittens/transfer/receive.go | 2 +- kitty_tests/file_transmission.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/kittens/transfer/receive.go b/kittens/transfer/receive.go index 8c1452e1a..a58faaf65 100644 --- a/kittens/transfer/receive.go +++ b/kittens/transfer/receive.go @@ -721,7 +721,7 @@ func files_for_receive(opts *Options, dest string, files []*remote_file, remote_ }) } else { f := files_for_spec[0] - f.expanded_local_path = dest + f.expanded_local_path = expand_home(dest) ans = append(ans, f) } } diff --git a/kitty_tests/file_transmission.py b/kitty_tests/file_transmission.py index 7b05dfb24..61f4f09c6 100644 --- a/kitty_tests/file_transmission.py +++ b/kitty_tests/file_transmission.py @@ -451,6 +451,13 @@ class TestFileTransmission(BaseTest): src = os.path.join(self.tdir, 'src') with open(src, 'wb') as s: s.write(self.src_data) + # home dir expansion + fname = 'tstest-file' + home = os.path.dirname(src) + with set_paths(home=home), self.run_kitten(['~/'+os.path.basename(src), f'~/{fname}'], home_dir=home) as pty: + pty.wait_till_child_exits(require_exit_code=0) + os.remove(os.path.join(home, fname)) + def test_transfer_send(self): self.basic_transfer_tests() @@ -458,9 +465,10 @@ class TestFileTransmission(BaseTest): with open(src, 'wb') as s: s.write(self.src_data) - # remote home + # home dir expansion fname = 'tstest-file' - with set_paths(home=self.tdir), self.run_kitten([src, '~/'+fname]) as pty: + home = os.path.dirname(src) + with set_paths(home=home), self.run_kitten(['~/'+os.path.basename(src), '~/'+fname], home_dir=home) as pty: pty.wait_till_child_exits(require_exit_code=0) os.remove(os.path.expanduser('~/'+fname))