qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-30 08:28:34 -06:00
Code Releases Activity

net: convert TestTCPServer to use subtests

Browse Source 
My fix in CL 202618 inadvertently violated an invariant in the inner
loop of TestTCPServer (namely, that len(trchs) == i). That causes a
panic when one or more of the channels is omitted due to a flake.

Instead of trying to fix up the test, let's just factor out a subtest
and skip the whole thing if the transceiver's Dial flakes out.

Updates #32919

Change-Id: Ib6f274a44194311c8c5a2faf19f586cc9eccfd4d
Reviewed-on: https://go-review.googlesource.com/c/go/+/202561
Run-TryBot: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Bryan C. Mills 2019-10-22 12:44:44 -04:00
parent 51504f0a2d
commit 22278ca0d4
1 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
src/net/server_test.go
View File

@ -56,79 +56,79 @@ func TestTCPServer(t *testing.T) {
const N = 3 const N = 3
for i, tt := range tcpServerTests { for i, tt := range tcpServerTests {
if !testableListenArgs(tt.snet, tt.saddr, tt.taddr) { t.Run(tt.snet+" "+tt.saddr+"<-"+tt.taddr, func(t *testing.T) {
t.Logf("skipping %s test", tt.snet+" "+tt.saddr+"<-"+tt.taddr) if !testableListenArgs(tt.snet, tt.saddr, tt.taddr) {
continue t.Skip("not testable")
} }
ln, err := Listen(tt.snet, tt.saddr) ln, err := Listen(tt.snet, tt.saddr)
if err != nil {
if perr := parseDialError(err); perr != nil {
t.Error(perr)
}
t.Fatal(err)
}
var lss []*localServer
var tpchs []chan error
defer func() {
for _, ls := range lss {
ls.teardown()
}
}()
for i := 0; i < N; i++ {
ls, err := (&streamListener{Listener: ln}).newLocalServer()
if err != nil {
t.Fatal(err)
}
lss = append(lss, ls)
tpchs = append(tpchs, make(chan error, 1))
}
for i := 0; i < N; i++ {
ch := tpchs[i]
handler := func(ls *localServer, ln Listener) { transponder(ln, ch) }
if err := lss[i].buildup(handler); err != nil {
t.Fatal(err)
}
}
var trchs []chan error
for i := 0; i < N; i++ {
_, port, err := SplitHostPort(lss[i].Listener.Addr().String())
if err != nil {
t.Fatal(err)
}
d := Dialer{Timeout: someTimeout}
c, err := d.Dial(tt.tnet, JoinHostPort(tt.taddr, port))
if err != nil { if err != nil {
if perr := parseDialError(err); perr != nil { if perr := parseDialError(err); perr != nil {
t.Error(perr) t.Error(perr)
} }
if tt.taddr == "::1" && os.Getenv("GO_BUILDER_NAME") == "darwin-amd64-10_12" && os.IsTimeout(err) {
// A suspected kernel bug in macOS 10.12 occasionally results in
// "i/o timeout" errors when dialing address ::1. The errors have not
// been observed on newer versions of the OS, so we don't plan to work
// around them. See https://golang.org/issue/32919.
t.Logf("ignoring error on known-flaky macOS 10.12 builder: %v", err)
continue
}
t.Fatal(err) t.Fatal(err)
} }
defer c.Close()
trchs = append(trchs, make(chan error, 1))
go transceiver(c, []byte("TCP SERVER TEST"), trchs[i])
}
for _, ch := range trchs { var lss []*localServer
for err := range ch { var tpchs []chan error
t.Errorf("#%d: %v", i, err) defer func() {
for _, ls := range lss {
ls.teardown()
}
}()
for i := 0; i < N; i++ {
ls, err := (&streamListener{Listener: ln}).newLocalServer()
if err != nil {
t.Fatal(err)
}
lss = append(lss, ls)
tpchs = append(tpchs, make(chan error, 1))
} }
} for i := 0; i < N; i++ {
for _, ch := range tpchs { ch := tpchs[i]
for err := range ch { handler := func(ls *localServer, ln Listener) { transponder(ln, ch) }
t.Errorf("#%d: %v", i, err) if err := lss[i].buildup(handler); err != nil {
t.Fatal(err)
}
} }
}
var trchs []chan error
for i := 0; i < N; i++ {
_, port, err := SplitHostPort(lss[i].Listener.Addr().String())
if err != nil {
t.Fatal(err)
}
d := Dialer{Timeout: someTimeout}
c, err := d.Dial(tt.tnet, JoinHostPort(tt.taddr, port))
if err != nil {
if perr := parseDialError(err); perr != nil {
t.Error(perr)
}
if tt.taddr == "::1" && os.Getenv("GO_BUILDER_NAME") == "darwin-amd64-10_12" && os.IsTimeout(err) {
// A suspected kernel bug in macOS 10.12 occasionally results in
// "i/o timeout" errors when dialing address ::1. The errors have not
// been observed on newer versions of the OS, so we don't plan to work
// around them. See https://golang.org/issue/32919.
t.Skipf("skipping due to error on known-flaky macOS 10.12 builder: %v", err)
}
t.Fatal(err)
}
defer c.Close()
trchs = append(trchs, make(chan error, 1))
go transceiver(c, []byte("TCP SERVER TEST"), trchs[i])
}
for _, ch := range trchs {
for err := range ch {
t.Errorf("#%d: %v", i, err)
}
}
for _, ch := range tpchs {
for err := range ch {
t.Errorf("#%d: %v", i, err)
}
}
})
} }
} }