From 1fc300ecbde330adb21498dae888e2ab614c470e Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Wed, 23 Aug 2017 14:22:08 -0700 Subject: [PATCH] testutil: don't panic on AssertNil on non-nil errors --- pkg/testutil/assert.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/testutil/assert.go b/pkg/testutil/assert.go index 8bd3922ee..9cf03457d 100644 --- a/pkg/testutil/assert.go +++ b/pkg/testutil/assert.go @@ -54,5 +54,9 @@ func AssertFalse(t *testing.T, v bool, msg ...string) { } func isNil(v interface{}) bool { - return v == nil || reflect.ValueOf(v).IsNil() + if v == nil { + return true + } + rv := reflect.ValueOf(v) + return rv.Kind() != reflect.Struct && rv.IsNil() }