aherman
/
packer
mirror of https://github.com/hashicorp/packer
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up recursive format tests to be more accurate

Browse Source
pull/10609/head
teddylear 5 years ago
parent 93df53a275
commit 40a97e29db
2 changed files with 47 additions and 54 deletions
Show Stats Download Patch File Download Diff File

51
command/fmt_test.go
Unescape View File

@ -1,7 +1,6 @@
package command
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
@ -105,64 +104,58 @@ ami_filter_owners = ["137112412989"]
func executeRecursiveTestCase(t *testing.T, tc RecursiveTestCase, c *FormatCommand) {
// Creating temp directories and files
subDir, err := ioutil.TempDir("test-fixtures/fmt", "sub_dir")
topDir, err := ioutil.TempDir("test-fixtures/fmt", "top-dir")
if err != nil {
t.Fatalf("failed to create sub level recurisve directory for test %s", err)
t.Fatalf("failed to create sub level recurisve directory for test case: %s, error: %s", tc.TestCaseName, err)
}
defer os.Remove(subDir)
defer os.Remove(topDir)
superSubDir, err := ioutil.TempDir(subDir, "super_sub_dir")
subDir, err := ioutil.TempDir(topDir, "sub-dir")
if err != nil {
t.Fatalf("failed to create sub level recurisve directory for test %s", err)
t.Fatalf("failed to create sub level recurisve directory for test case: %s, error: %s", tc.TestCaseName, err)
}
defer os.Remove(superSubDir)
defer os.Remove(subDir)
tf, err := ioutil.TempFile(subDir, "*.pkrvars.hcl")
topTempFile, err := ioutil.TempFile(topDir, "*.pkrvars.hcl")
if err != nil {
t.Fatalf("failed to create top level tempfile for test %s", err)
t.Fatalf("failed to create top level tempfile for test case: %s, error: %s", tc.TestCaseName, err)
}
defer os.Remove(tf.Name())
_, _ = tf.Write(tc.TopLevelFilePreFormat)
tf.Close()
defer os.Remove(topTempFile.Name())
data, err := ioutil.ReadFile(tf.Name())
if err != nil {
t.Fatalf("failed to open the newly formatted fixture %s", err)
}
fmt.Println(fmt.Sprintf("top level data: %v", data))
_, _ = topTempFile.Write(tc.TopLevelFilePreFormat)
topTempFile.Close()
subTf, err := ioutil.TempFile(superSubDir, "*.pkrvars.hcl")
subTempFile, err := ioutil.TempFile(subDir, "*.pkrvars.hcl")
if err != nil {
t.Fatalf("failed to create sub level tempfile for test %s", err)
t.Fatalf("failed to create sub level tempfile for test case: %s, error: %s", tc.TestCaseName, err)
}
defer os.Remove(subTf.Name())
defer os.Remove(subTempFile.Name())
_, _ = subTf.Write(tc.LowerLevelFilePreFormat)
subTf.Close()
_, _ = subTempFile.Write(tc.LowerLevelFilePreFormat)
subTempFile.Close()
var args []string
if tc.Recursion {
args = []string{"-recursive=true", subDir}
args = []string{"-recursive=true", topDir}
} else {
args = []string{subDir}
args = []string{topDir}
}
if code := c.Run(args); code != 0 {
fatalCommand(t, c.Meta)
}
validateFileIsFormatted(t, tc.TopLevelFilePostFormat, tf, tc)
validateFileIsFormatted(t, tc.LowerLevelFilePostFormat, subTf, tc)
validateFileIsFormatted(t, tc.TopLevelFilePostFormat, topTempFile, tc)
validateFileIsFormatted(t, tc.LowerLevelFilePostFormat, subTempFile, tc)
}
func validateFileIsFormatted(t *testing.T, formattedData []byte, testFile *os.File, tc RecursiveTestCase) {
data, err := ioutil.ReadFile(testFile.Name())
if err != nil {
t.Fatalf("failed to open the newly formatted fixture %s", err)
t.Fatalf("failed to open the newly formatted fixture for test case: %s, error: %s", tc.TestCaseName, err)
}
if diff := cmp.Diff(string(data), string(formattedData)); diff != "" {
t.Errorf("Unexpected format tfData output on tc: %v, diff: %s", tc.TestCaseName, diff)
t.Errorf("Unexpected format tfData output for test case: %v, diff: %s", tc.TestCaseName, diff)
}
}

50
hcl2template/formatter_test.go
Unescape View File

@ -382,55 +382,55 @@ build {
func executeRecursiveTestCase(t *testing.T, tc FormatterRecursiveTestCase, f *HCL2Formatter) {
f.Recursive = tc.Recursion
var subDir string
subDir, err := ioutil.TempDir("testdata/format", "sub_dir")
var topDir string
topDir, err := ioutil.TempDir("testdata/format", "top-dir")
if err != nil {
t.Fatalf("failed to create sub level recurisve directory for test %s", err)
t.Fatalf("failed to create sub level recurisve directory for test case: %s, errors: %s", tc.TestCaseName, err)
}
defer os.Remove(subDir)
defer os.Remove(topDir)
var superSubDir string
superSubDir, err = ioutil.TempDir(subDir, "super_sub_dir")
var subDir string
subDir, err = ioutil.TempDir(topDir, "sub-dir")
if err != nil {
t.Fatalf("failed to create sub level recurisve directory for test %s", err)
t.Fatalf("failed to create sub level recurisve directory for test case: %s, errors: %s", tc.TestCaseName, err)
}
defer os.Remove(superSubDir)
defer os.Remove(subDir)
tf, err := ioutil.TempFile(subDir, "*.pkr.hcl")
topTempFile, err := ioutil.TempFile(topDir, "*.pkr.hcl")
if err != nil {
t.Fatalf("failed to create top level tempfile for test %s", err)
t.Fatalf("failed to create top level tempfile for test case: %s, errors: %s", tc.TestCaseName, err)
}
defer os.Remove(tf.Name())
defer os.Remove(topTempFile.Name())
_, _ = tf.Write(tc.TopLevelFilePreFormat)
tf.Close()
_, _ = topTempFile.Write(tc.TopLevelFilePreFormat)
topTempFile.Close()
subTf, err := ioutil.TempFile(superSubDir, "*.pkr.hcl")
subTempFile, err := ioutil.TempFile(subDir, "*.pkr.hcl")
if err != nil {
t.Fatalf("failed to create sub level tempfile for test %s", err)
t.Fatalf("failed to create sub level tempfile for test case: %s, errors: %s", tc.TestCaseName, err)
}
defer os.Remove(subTf.Name())
defer os.Remove(subTempFile.Name())
_, _ = subTf.Write(tc.LowerLevelFilePreFormat)
subTf.Close()
_, _ = subTempFile.Write(tc.LowerLevelFilePreFormat)
subTempFile.Close()
_, diags := f.Format(subDir)
_, diags := f.Format(topDir)
if diags.HasErrors() {
t.Fatalf("the call to Format failed unexpectedly %s", diags.Error())
t.Fatalf("the call to Format failed unexpectedly for test case: %s, errors: %s", tc.TestCaseName, diags.Error())
}
validateFileIsFormatted(t, tc.TopLevelFilePostFormat, tf)
validateFileIsFormatted(t, tc.LowerLevelFilePostFormat, subTf)
validateFileIsFormatted(t, tc.TopLevelFilePostFormat, topTempFile, tc.TestCaseName)
validateFileIsFormatted(t, tc.LowerLevelFilePostFormat, subTempFile, tc.TestCaseName)
}
func validateFileIsFormatted(t *testing.T, formattedData []byte, testFile *os.File) {
func validateFileIsFormatted(t *testing.T, formattedData []byte, testFile *os.File, testCaseName string) {
data, err := ioutil.ReadFile(testFile.Name())
if err != nil {
t.Fatalf("failed to open the newly formatted fixture %s", err)
t.Fatalf("failed to open the newly formatted fixture for test case: %s, errors: %s", testCaseName, err)
}
if diff := cmp.Diff(string(data), string(formattedData)); diff != "" {
t.Errorf("Unexpected format tfData output %s", diff)
t.Errorf("Unexpected format tfData output for test case: %s, errors: %s", testCaseName, diff)
}
}

Write Preview
Loading…
Cancel
Save