From 61c5167554bf5a1d4adcb6a714b4dbacb8169fb1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 22 May 2024 08:05:32 +0530 Subject: [PATCH] Show stdio output from ssh if getting options fails --- kittens/ssh/utils.go | 2 +- kittens/ssh/utils_test.go | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/kittens/ssh/utils.go b/kittens/ssh/utils.go index a1ff921b9..e66a2a1b8 100644 --- a/kittens/ssh/utils.go +++ b/kittens/ssh/utils.go @@ -41,7 +41,7 @@ var SSHOptions = sync.OnceValue(func() (ssh_options map[string]string) { if err != nil { return } - if err := cmd.Start(); err != nil { + if err = cmd.Start(); err != nil { return } raw, err := io.ReadAll(stderr) diff --git a/kittens/ssh/utils_test.go b/kittens/ssh/utils_test.go index e76c181f1..09197acbb 100644 --- a/kittens/ssh/utils_test.go +++ b/kittens/ssh/utils_test.go @@ -5,6 +5,7 @@ package ssh import ( "fmt" "os" + "os/exec" "path/filepath" "testing" @@ -18,6 +19,11 @@ var _ = fmt.Print func TestGetSSHOptions(t *testing.T) { m := SSHOptions() if m["w"] != "local_tun[:remote_tun]" { + + cmd := exec.Command(SSHExe()) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.Run() t.Fatalf("Unexpected set of SSH options: %#v", m) } }