commit 41b796e16123cc7bdbb416d52cc66992d1e51b59
author Michael Fraenkel <michael.fraenkel@gmail.com> Thu Jul 05 10:44:37 2018 -0400
committer Brad Fitzpatrick <bradfitz@golang.org> Fri Jul 06 02:05:55 2018 +0000
tree fd9e83f863d392874d87d3347462b4074adf7f15
parent ed29d75add3d7c4bf7ca65aac0c6df3d1420216f

http2: fix expected message order in TestServerHandlerConnectionClose

There is no guaranteed ordering between writing headers and graceful
shutdown, both put a message on different channels.

Fixes golang/go#26190

Change-Id: I883fcf1de4bbe5a87af418d1b897a8aa941f1fd4
Reviewed-on: https://go-review.googlesource.com/122335
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

http2/server_test.go

diff --git a/http2/server_test.go b/http2/server_test.go
index 02eb0dc..9c3e549 100644
--- a/http2/server_test.go
+++ b/http2/server_test.go
@@ -3817,9 +3817,6 @@
 				}
 			case *HeadersFrame:
 				goth := st.decodeHeader(f.HeaderBlockFragment())
-				if !sawGoAway {
-					t.Fatalf("unexpected Headers frame before GOAWAY: %s, %v", summarizeFrame(f), goth)
-				}
 				wanth := [][2]string{
 					{":status", "200"},
 					{"foo", "bar"},
@@ -3836,6 +3833,9 @@
 				t.Logf("unexpected frame: %v", summarizeFrame(f))
 			}
 		}
+		if !sawGoAway {
+			t.Errorf("didn't see GOAWAY")
+		}
 		if !sawRes {
 			t.Errorf("didn't see response")
 		}