Add a test help to verify that a test panicked

pkg/skaffold/apiversion/apiversion_test.go

@@ -16,23 +16,20 @@ limitations under the License.
 package apiversion
 
 import (
-	"reflect"
 	"testing"
 
+	"github.com/GoogleContainerTools/skaffold/testutil"
 	"github.com/blang/semver"
 )
 
 func TestMustParse(t *testing.T) {
-	_ = MustParse("skaffold/v1alpha4")
+	MustParse("skaffold/v1alpha4")
 }
 
 func TestMustParse_panic(t *testing.T) {
-	defer func() {
-		if recover() == nil {
-			t.Errorf("Should have panicked")
-		}
-	}()
-	_ = MustParse("invalid version")
+	defer testutil.EnsureTestPanicked(t)
+
+	MustParse("invalid version")
 }
 
 func TestParseVersion(t *testing.T) {
@@ -83,13 +80,8 @@ func TestParseVersion(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := Parse(tt.args.v)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("Parse() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("Parse() = %v, want %v", got, tt.want)
-			}
+
+			testutil.CheckErrorAndDeepEqual(t, tt.wantErr, err, tt.want, got)
 		})
 	}
 }

pkg/skaffold/yamltags/tags_test.go

@@ -158,17 +158,13 @@ func TestValidateStructOneOf(t *testing.T) {
 }
 
 func TestValidateStructInvalid(t *testing.T) {
-	invalidYamlTags := struct {
-		A string `yamltags:"invalidTag"`
-	}{A: "whatever"}
+	defer testutil.EnsureTestPanicked(t)
 
-	defer func() {
-		if recover() == nil {
-			t.Errorf("should have panicked")
-		}
-	}()
+	invalidTags := struct {
+		A string `yamltags:"invalidTag"`
+	}{}
 
-	_ = ValidateStruct(invalidYamlTags)
+	ValidateStruct(invalidTags)
 }
 
 func TestIsZeroValue(t *testing.T) {

testutil/util.go

@@ -93,6 +93,12 @@ func CheckErrorContains(t *testing.T, message string, err error) {
 	}
 }
 
+func EnsureTestPanicked(t *testing.T) {
+	if recover() == nil {
+		t.Errorf("should have panicked")
+	}
+}
+
 // Chdir changes current directory for a test
 func Chdir(t *testing.T, dir string) func() {
 	t.Helper()