http2: remove use of DeepEqual for testing errors
Comparing errors using DeepEqual breaks if frame information
is added as proposed in golang/go#29934.
Updates golang/go#29934
Change-Id: Ia2eb3f5ae2bdeac322b34e12d8e732174b9bd355
Reviewed-on: https://go-review.googlesource.com/c/164517
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/http2/http2_test.go b/http2/http2_test.go
index dda6743..d6007be 100644
--- a/http2/http2_test.go
+++ b/http2/http2_test.go
@@ -226,6 +226,16 @@
return err
}
+func equalError(a, b error) bool {
+ if a == nil {
+ return b == nil
+ }
+ if b == nil {
+ return a == nil
+ }
+ return a.Error() == b.Error()
+}
+
// Tests that http2.Server.IdleTimeout is initialized from
// http.Server.{Idle,Read}Timeout. http.Server.IdleTimeout was
// added in Go 1.8.
diff --git a/http2/server_test.go b/http2/server_test.go
index cc8326f..c543143 100644
--- a/http2/server_test.go
+++ b/http2/server_test.go
@@ -3526,7 +3526,7 @@
}
for i, tt := range tests {
got := checkValidHTTP2RequestHeaders(tt.h)
- if !reflect.DeepEqual(got, tt.want) {
+ if !equalError(got, tt.want) {
t.Errorf("%d. checkValidHTTP2Request = %v; want %v", i, got, tt.want)
}
}
