fixup: error type checking

Signed-off-by: Matej Vasek <mvasek@redhat.com>
buildpacks · Jan 5, 2022 · 0cfb7ae · 0cfb7ae
1 parent c6ed564
commit 0cfb7ae
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/internal/sshdialer/posix_test.go b/internal/sshdialer/posix_test.go
@@ -4,6 +4,7 @@
 package sshdialer_test
 
 import (
+	"errors"
 	"net"
 	"os"
 )
@@ -18,3 +19,7 @@ func fixupPrivateKeyMod(path string) {
 func listen(addr string) (net.Listener, error) {
 	return net.Listen("unix", addr)
 }
+
+func isErrClosed(err error) bool {
+	return errors.Is(err, net.ErrClosed)
+}
diff --git a/internal/sshdialer/ssh_dialer_test.go b/internal/sshdialer/ssh_dialer_test.go
@@ -811,7 +811,7 @@ func withSSHAgent(t *testing.T, ag agent.Agent) func() {
 				}()
 				err := agent.ServeAgent(ag, conn)
 				if err != nil {
-					if !errors.Is(err, net.ErrClosed) {
+					if !isErrClosed(err) {
 						fmt.Fprintf(os.Stderr, "agent.ServeAgent() failed: %v\n", err)
 					}
 				}
@@ -827,7 +827,7 @@ func withSSHAgent(t *testing.T, ag agent.Agent) func() {
 
 		err = <-errChan
 
-		if !errors.Is(err, net.ErrClosed) {
+		if !isErrClosed(err) {
 			t.Fatal(err)
 		}
 		cancel()

diff --git a/internal/sshdialer/windows_test.go b/internal/sshdialer/windows_test.go
@@ -4,6 +4,7 @@
 package sshdialer_test
 
 import (
+	"errors"
 	"net"
 	"os/user"
 	"strings"
@@ -35,3 +36,7 @@ func listen(addr string) (net.Listener, error) {
 	}
 	return net.Listen("unix", addr)
 }
+
+func isErrClosed(err error) bool {
+	return errors.Is(err, net.ErrClosed) || errors.Is(err, npipe.ErrClosed)
+}