Merge pull request GoogleContainerTools#1383 from dgageot/improve-sch…

…ema-upgrade-tests Improve schema upgrade tests
beastpu · Dec 12, 2018 · dd8ffa4 · dd8ffa4
2 parents be21312 + 383d60a
commit dd8ffa4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/pkg/skaffold/schema/v1alpha1/upgrade_test.go b/pkg/skaffold/schema/v1alpha1/upgrade_test.go
@@ -83,14 +83,13 @@ deploy:
 func verityUpgrade(t *testing.T, input, output string) {
 	pipeline := NewSkaffoldPipeline()
 	err := yaml.UnmarshalStrict([]byte(input), pipeline)
-	testutil.CheckError(t, false, err)
+	testutil.CheckErrorAndDeepEqual(t, false, err, Version, pipeline.GetVersion())
 
 	upgraded, err := pipeline.Upgrade()
 	testutil.CheckError(t, false, err)
 
 	expected := v1alpha2.NewSkaffoldPipeline()
 	err = yaml.UnmarshalStrict([]byte(output), expected)
-	testutil.CheckError(t, false, err)
 
 	testutil.CheckErrorAndDeepEqual(t, false, err, expected, upgraded)
 }
diff --git a/pkg/skaffold/schema/v1alpha2/upgrade_test.go b/pkg/skaffold/schema/v1alpha2/upgrade_test.go
@@ -98,14 +98,13 @@ profiles:
 func verityUpgrade(t *testing.T, input, output string) {
 	pipeline := NewSkaffoldPipeline()
 	err := yaml.UnmarshalStrict([]byte(input), pipeline)
-	testutil.CheckError(t, false, err)
+	testutil.CheckErrorAndDeepEqual(t, false, err, Version, pipeline.GetVersion())
 
 	upgraded, err := pipeline.Upgrade()
 	testutil.CheckError(t, false, err)
 
 	expected := v1alpha3.NewSkaffoldPipeline()
 	err = yaml.UnmarshalStrict([]byte(output), expected)
-	testutil.CheckError(t, false, err)
 
 	testutil.CheckErrorAndDeepEqual(t, false, err, expected, upgraded)
 }
diff --git a/pkg/skaffold/schema/v1alpha3/upgrade_test.go b/pkg/skaffold/schema/v1alpha3/upgrade_test.go
@@ -104,14 +104,13 @@ profiles:
 func verityUpgrade(t *testing.T, input, output string) {
 	pipeline := NewSkaffoldPipeline()
 	err := yaml.UnmarshalStrict([]byte(input), pipeline)
-	testutil.CheckError(t, false, err)
+	testutil.CheckErrorAndDeepEqual(t, false, err, Version, pipeline.GetVersion())
 
 	upgraded, err := pipeline.Upgrade()
 	testutil.CheckError(t, false, err)
 
 	expected := v1alpha4.NewSkaffoldPipeline()
 	err = yaml.UnmarshalStrict([]byte(output), expected)
-	testutil.CheckError(t, false, err)
 
 	testutil.CheckErrorAndDeepEqual(t, false, err, expected, upgraded)
 }
diff --git a/pkg/skaffold/schema/v1alpha4/upgrade_test.go b/pkg/skaffold/schema/v1alpha4/upgrade_test.go
@@ -86,14 +86,13 @@ profiles:
 func verityUpgrade(t *testing.T, input, output string) {
 	pipeline := NewSkaffoldPipeline()
 	err := yaml.UnmarshalStrict([]byte(input), pipeline)
-	testutil.CheckError(t, false, err)
+	testutil.CheckErrorAndDeepEqual(t, false, err, Version, pipeline.GetVersion())
 
 	upgraded, err := pipeline.Upgrade()
 	testutil.CheckError(t, false, err)
 
 	expected := v1alpha5.NewSkaffoldPipeline()
 	err = yaml.UnmarshalStrict([]byte(output), expected)
-	testutil.CheckError(t, false, err)
 
 	testutil.CheckErrorAndDeepEqual(t, false, err, expected, upgraded)
 }
diff --git a/pkg/skaffold/schema/v1alpha5/upgrade_test.go b/pkg/skaffold/schema/v1alpha5/upgrade_test.go
@@ -118,7 +118,7 @@ profiles:
 func upgradeShouldFailt(t *testing.T, input string) {
 	pipeline := NewSkaffoldPipeline()
 	err := yaml.UnmarshalStrict([]byte(input), pipeline)
-	testutil.CheckError(t, false, err)
+	testutil.CheckErrorAndDeepEqual(t, false, err, Version, pipeline.GetVersion())
 
 	_, err = pipeline.Upgrade()
 	testutil.CheckError(t, true, err)
@@ -127,14 +127,13 @@ func upgradeShouldFailt(t *testing.T, input string) {
 func verityUpgrade(t *testing.T, input, output string) {
 	pipeline := NewSkaffoldPipeline()
 	err := yaml.UnmarshalStrict([]byte(input), pipeline)
-	testutil.CheckError(t, false, err)
+	testutil.CheckErrorAndDeepEqual(t, false, err, Version, pipeline.GetVersion())
 
 	upgraded, err := pipeline.Upgrade()
 	testutil.CheckError(t, false, err)
 
 	expected := v1beta1.NewSkaffoldPipeline()
 	err = yaml.UnmarshalStrict([]byte(output), expected)
-	testutil.CheckError(t, false, err)
 
 	testutil.CheckErrorAndDeepEqual(t, false, err, expected, upgraded)
 }
diff --git a/pkg/skaffold/schema/v1beta1/upgrade_test.go b/pkg/skaffold/schema/v1beta1/upgrade_test.go
@@ -85,14 +85,13 @@ profiles:
 func verityUpgrade(t *testing.T, input, output string) {
 	pipeline := NewSkaffoldPipeline()
 	err := yaml.UnmarshalStrict([]byte(input), pipeline)
-	testutil.CheckError(t, false, err)
+	testutil.CheckErrorAndDeepEqual(t, false, err, Version, pipeline.GetVersion())
 
 	upgraded, err := pipeline.Upgrade()
 	testutil.CheckError(t, false, err)
 
 	expected := latest.NewSkaffoldPipeline()
 	err = yaml.UnmarshalStrict([]byte(output), expected)
-	testutil.CheckError(t, false, err)
 
 	testutil.CheckErrorAndDeepEqual(t, false, err, expected, upgraded)
 }