]> Cypherpunks repositories - gostls13.git/commitdiff
net: fix TestCloseError on Plan 9
authorDavid du Colombier <0intro@gmail.com>
Mon, 24 Oct 2016 22:12:57 +0000 (00:12 +0200)
committerBrad Fitzpatrick <bradfitz@golang.org>
Mon, 24 Oct 2016 22:35:03 +0000 (22:35 +0000)
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>
src/net/error_test.go

index d6de5a3e68f048c3e6d1546e351852f49dea9aeb..8903f1de8a3c16d47161add98822a1672059e9ec 100644 (file)
@@ -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)
 }