From 2e60680932240e15a179f3b34782f42b7199981a Mon Sep 17 00:00:00 2001
From: Adam Langley <agl@golang.org>
Date: Thu, 26 Apr 2012 17:19:18 -0400
Subject: [PATCH] ssh: fix flaky TestInvalidServerMessage

When shutting down the test, we sometimes see EOF on the server's side
of the connection and sometimes ECONNRESET. In the latter case, based
on timing, it was possible that the server loop would hit Errorf during
shutdown and cause the test to fail.

R=dave
CC=golang-dev
https://golang.org/cl/6125047
---
 ssh/session_test.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ssh/session_test.go b/ssh/session_test.go
index df97fcf..5d6135e 100644
--- a/ssh/session_test.go
+++ b/ssh/session_test.go
@@ -9,6 +9,7 @@ package ssh
 import (
 	"bytes"
 	"io"
+	"net"
 	"testing"
 
 	"code.google.com/p/go.crypto/ssh/terminal"
@@ -45,6 +46,10 @@ func dial(handler serverType, t *testing.T) *ClientConn {
 			if err == io.EOF {
 				return
 			}
+			// We sometimes get ECONNRESET rather than EOF.
+			if _, ok := err.(*net.OpError); ok {
+				return
+			}
 			if err != nil {
 				t.Errorf("Unable to accept incoming channel request: %v", err)
 				return