kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cloudformation tests: use standard file comparison 

This allows us to auto-fix the expected output also.
This commit is contained in:
Justin SB 2019-08-22 01:14:19 -04:00
parent 54e2d9f645
commit e28b4192ab
No known key found for this signature in database
GPG Key ID: 8DEC5C8217494E37
2 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kops/BUILD.bazel
View File

@ -163,7 +163,6 @@ go_test(
"//cloudmock/aws/mockec2:go_default_library",
"//cmd/kops/util:go_default_library",
"//pkg/apis/kops:go_default_library",
"//pkg/diff:go_default_library",
"//pkg/featureflag:go_default_library",
"//pkg/jsonutils:go_default_library",
"//pkg/kopscodecs:go_default_library",

44
cmd/kops/integration_test.go
View File

@ -35,7 +35,6 @@ import (
"time"
"k8s.io/kops/cmd/kops/util"
"k8s.io/kops/pkg/diff"
"k8s.io/kops/pkg/featureflag"
"k8s.io/kops/pkg/jsonutils"
"k8s.io/kops/pkg/testutils"
@ -609,41 +608,24 @@ func runTestCloudformation(t *testing.T, clusterName string, srcDir string, vers
testutils.AssertMatchesFile(t, string(actualCF), path.Join(srcDir, expectedCfPath))
fp := path.Join(srcDir, expectedCfPath+".extracted.yaml")
expectedExtracted, err := ioutil.ReadFile(fp)
if err != nil {
t.Fatalf("unexpected error reading expected extracted cloudformation output: %v", err)
}
// test extracted values
{
actual := make(map[string]string)
expected := make(map[string]string)
err = yaml.Unmarshal(expectedExtracted, &expected)
if err != nil {
t.Fatalf("unexpected error unmarshal expected extracted cloudformation output: %v", err)
}
for k, v := range extracted {
// Strip carriage return as expectedValue is stored in a yaml string literal
// and yaml block quoting doesn't seem to support \r in a string
v = strings.Replace(v, "\r", "", -1)
if len(extracted) != len(expected) {
t.Fatalf("error differed number of cloudformation in expected and extracted: %v", err)
}
actual := make(map[string]string)
for key, expectedValue := range expected {
extractedValue, ok := extracted[key]
if !ok {
t.Fatalf("unexpected error expected cloudformation not found for k: %v", key)
actual[k] = v
}
actual[key] = extractedValue
// Strip carriage return as expectedValue is stored in a yaml string literal
// and yaml block quoting doesn't seem to support \r in a string
extractedValueTrimmed := strings.Replace(extractedValue, "\r", "", -1)
if expectedValue != extractedValueTrimmed {
diffString := diff.FormatDiff(expectedValue, extractedValueTrimmed)
t.Logf("diff for key %s:\n%s\n\n\n\n\n\n", key, diffString)
t.Errorf("cloudformation output differed from expected. Test file: %s", path.Join(srcDir, expectedCfPath+".extracted.yaml"))
actualExtracted, err := yaml.Marshal(actual)
if err != nil {
t.Fatalf("error serializing yaml: %v", err)
}
testutils.AssertMatchesFile(t, string(actualExtracted), path.Join(srcDir, expectedCfPath+".extracted.yaml"))
}
testutils.AssertMatchesFile(t, string(actualCF), path.Join(srcDir, expectedCfPath))