diff options
| author | Nicola Murino <nicola.murino@gmail.com> | 2023-07-29 03:33:00 +0000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2023-07-31 18:14:41 +0000 |
| commit | edc325d13aa98b5b79708f7122a33bf392cdc1a7 (patch) | |
| tree | 2432106a3e1b2a77f23736908de4b6767e2e0895 /ssh/agent/server_test.go | |
| parent | eab931596093977eaac68313fb6020a29ed7653e (diff) | |
| download | go-x-crypto-edc325d13aa98b5b79708f7122a33bf392cdc1a7.tar.xz | |
ssh: fix call to Fatalf from a non-test goroutine
Also fix some redundant type declarations.
Change-Id: Iad2950b67b1ec2e2590c59393b8ad15421ed3add
GitHub-Last-Rev: 41cf552f11387208491dee7b867050475043b25e
GitHub-Pull-Request: golang/crypto#263
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/505798
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: David Chase <drchase@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Filippo Valsorda <filippo@golang.org>
Run-TryBot: Filippo Valsorda <filippo@golang.org>
Diffstat (limited to 'ssh/agent/server_test.go')
| -rw-r--r-- | ssh/agent/server_test.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ssh/agent/server_test.go b/ssh/agent/server_test.go index 038018e..0af8545 100644 --- a/ssh/agent/server_test.go +++ b/ssh/agent/server_test.go @@ -53,10 +53,11 @@ func TestSetupForwardAgent(t *testing.T) { incoming := make(chan *ssh.ServerConn, 1) go func() { conn, _, _, err := ssh.NewServerConn(a, &serverConf) + incoming <- conn if err != nil { - t.Fatalf("Server: %v", err) + t.Errorf("NewServerConn error: %v", err) + return } - incoming <- conn }() conf := ssh.ClientConfig{ @@ -71,8 +72,10 @@ func TestSetupForwardAgent(t *testing.T) { if err := ForwardToRemote(client, socket); err != nil { t.Fatalf("SetupForwardAgent: %v", err) } - server := <-incoming + if server == nil { + t.Fatal("Unable to get server") + } ch, reqs, err := server.OpenChannel(channelType, nil) if err != nil { t.Fatalf("OpenChannel(%q): %v", channelType, err) |