From: David du Colombier <0intro@gmail.com>
Date: Mon, 24 Oct 2016 22:12:57 +0000 (+0200)
Subject: net: fix TestCloseError on Plan 9
X-Git-Tag: go1.8beta1~670
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0c02280fe0b4a178f78633721201f899e5213414;p=gostls13.git

net: fix TestCloseError on Plan 9

Since CL 30614, TestCloseError is failing on Plan 9,
because File.Write now checks f.fd == badFd before
calling syscall.Write.

The f.fd == badFd check returns os.ErrClosed, while
syscall.Write returned a syscall.ErrorString error.

TestCloseError was failing because it expected a
syscall.ErrorString error.

We add a case in parseCloseError to handle the
os.ErrClosed case.

Fixes #17569.

Change-Id: I6b4d956d18ed6d3c2ac5211ffd50a4888f7521e1
Reviewed-on: https://go-review.googlesource.com/31872
Run-TryBot: David du Colombier <0intro@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/net/error_test.go b/src/net/error_test.go
index d6de5a3e68..8903f1de8a 100644
--- a/src/net/error_test.go
+++ b/src/net/error_test.go
@@ -521,6 +521,10 @@ third:
 	if isPlatformError(nestedErr) {
 		return nil
 	}
+	switch nestedErr {
+	case os.ErrClosed: // for Plan 9
+		return nil
+	}
 	return fmt.Errorf("unexpected type on 3rd nested level: %T", nestedErr)
 }