Skip to content

Commit 17aa362

Browse files
committed
fix some unreachable code
Signed-off-by: Abirdcfly <[email protected]>
1 parent 4f81511 commit 17aa362

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

bfe_basic/condition/primitive_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ func TestContextValueFetcher(t *testing.T) {
234234
contextVal, err := hf.Fetch(req)
235235
if err != nil {
236236
t.Fatalf("Fetch(): %v", err)
237-
t.FailNow()
238237
}
239238

240239
// check

bfe_http2/server_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2224,12 +2224,22 @@ func testServerResponse(t testing.TB,
22242224
handler func(http.ResponseWriter, *http.Request) error,
22252225
client func(*serverTester),
22262226
) {
2227-
errc := make(chan error, 1)
22282227
st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
22292228
if r.Body == nil {
22302229
t.Fatal("nil Body")
22312230
}
2232-
errc <- handler(w, r)
2231+
errc := make(chan error, 1)
2232+
go func() {
2233+
errc <- handler(w, r)
2234+
}()
2235+
select {
2236+
case err := <-errc:
2237+
if err != nil {
2238+
t.Fatalf("Error in handler: %v", err)
2239+
}
2240+
case <-time.After(2 * time.Second):
2241+
t.Error("timeout waiting for handler to finish")
2242+
}
22332243
})
22342244
defer st.Close()
22352245

@@ -2246,15 +2256,6 @@ func testServerResponse(t testing.TB,
22462256
case <-time.After(5 * time.Second):
22472257
t.Fatal("timeout")
22482258
}
2249-
2250-
select {
2251-
case err := <-errc:
2252-
if err != nil {
2253-
t.Fatalf("Error in handler: %v", err)
2254-
}
2255-
case <-time.After(2 * time.Second):
2256-
t.Error("timeout waiting for handler to finish")
2257-
}
22582259
}
22592260

22602261
// readBodyHandler returns an http Handler func that reads len(want)
@@ -3000,7 +3001,6 @@ func TestNoRstPostAfterGOAWAY(t *testing.T) {
30003001
}
30013002
if gf, ok := f.(*RSTStreamFrame); ok && gf.StreamID == 1 {
30023003
t.Fatal("got rst but want no ret")
3003-
break
30043004
}
30053005
}
30063006

bfe_spdy/server_test.go

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -461,12 +461,23 @@ func testServerResponse(t testing.TB,
461461
handler func(http.ResponseWriter, *http.Request) error,
462462
client func(*serverTester),
463463
) {
464-
errc := make(chan error, defaultMaxStreams)
465464
st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
466465
if r.Body == nil {
467466
t.Fatal("nil Body")
468467
}
469-
errc <- handler(w, r)
468+
errc := make(chan error, defaultMaxStreams)
469+
go func() {
470+
errc <- handler(w, r)
471+
}()
472+
// verify output of server handler
473+
select {
474+
case err := <-errc:
475+
if err != nil {
476+
t.Fatalf("Error in handler: %v", err)
477+
}
478+
case <-time.After(2 * time.Second):
479+
t.Error("timeout waiting for handler to finish")
480+
}
470481
})
471482
defer st.Close()
472483

@@ -487,16 +498,6 @@ func testServerResponse(t testing.TB,
487498
case <-time.After(10 * time.Second):
488499
t.Fatal("timeout")
489500
}
490-
491-
// verify output of server handler
492-
select {
493-
case err := <-errc:
494-
if err != nil {
495-
t.Fatalf("Error in handler: %v", err)
496-
}
497-
case <-time.After(2 * time.Second):
498-
t.Error("timeout waiting for handler to finish")
499-
}
500501
}
501502

502503
// testServerRejects tests that the server hangs up with a GOAWAY
@@ -844,7 +845,7 @@ func TestServer_CloseNotify_After_StreamError(t *testing.T) {
844845
}, nil, "content-length", "3")
845846
}
846847

847-
//writes a SynStream frames with StreamId 1 and EndStream set.
848+
// writes a SynStream frames with StreamId 1 and EndStream set.
848849
func getSlash(st *serverTester) error {
849850
return st.writeSynStream(1, nil, true)
850851
}

0 commit comments

Comments
 (0)