iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better error handling and messaging in provisioner acc test framework

This commit is contained in:
Megan Marsh 2020-12-08 09:59:04 -08:00
parent 2797c686e0
commit 48a0172670
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packer-plugin-sdk/acctest/provisioneracc/provisioners.go
View File

@ -206,8 +206,13 @@ func TestProvisionersAgainstBuilders(testCase *ProvisionerTestCase, t *testing.T
writeJsonTemplate(out, templatePath, t) writeJsonTemplate(out, templatePath, t)
logfile := fmt.Sprintf("packer_log_%s_%s.txt", builderType, testCase.Type) logfile := fmt.Sprintf("packer_log_%s_%s.txt", builderType, testCase.Type)
// Make sure packer is installed:
packerbin, err := exec.LookPath("packer")
if err != nil {
t.Fatalf("Couldn't find packer binary installed on system: %s", err.Error())
}
// Run build // Run build
buildCommand := exec.Command("packer", "build", "--machine-readable", templatePath) buildCommand := exec.Command(packerbin, "build", "--machine-readable", templatePath)
buildCommand.Env = append(buildCommand.Env, os.Environ()...) buildCommand.Env = append(buildCommand.Env, os.Environ()...)
buildCommand.Env = append(buildCommand.Env, "PACKER_LOG=1", buildCommand.Env = append(buildCommand.Env, "PACKER_LOG=1",
fmt.Sprintf("PACKER_LOG_PATH=%s", logfile)) fmt.Sprintf("PACKER_LOG_PATH=%s", logfile))
@ -234,10 +239,12 @@ func TestProvisionersAgainstBuilders(testCase *ProvisionerTestCase, t *testing.T
// Fail test if check failed. // Fail test if check failed.
if checkErr != nil { if checkErr != nil {
t.Fatalf(fmt.Sprint("Error running provisioner acceptance"+ cwd, _ := os.Getwd()
" tests: %s\nLogs can be found at %s and the "+ t.Fatalf(fmt.Sprintf("Error running provisioner acceptance"+
" tests: %s\nLogs can be found at %s\nand the "+
"acceptance test template can be found at %s", "acceptance test template can be found at %s",
checkErr.Error(), logfile, templatePath)) checkErr.Error(), filepath.Join(cwd, logfile),
filepath.Join(cwd, templatePath)))
} else { } else {
os.Remove(templatePath) os.Remove(templatePath)
os.Remove(logfile) os.Remove(logfile)

2
provisioner/shell-local/provisioner_acc_test.go
View File

@ -58,7 +58,7 @@ func TestAccShellProvisioner_basic(t *testing.T) {
Check: func(buildcommand *exec.Cmd, logfile string) error { Check: func(buildcommand *exec.Cmd, logfile string) error {
if buildcommand.ProcessState != nil { if buildcommand.ProcessState != nil {
if buildcommand.ProcessState.ExitCode() != 0 { if buildcommand.ProcessState.ExitCode() != 0 {
return fmt.Errorf("Bad exit code. Logfile: %s", logfile) return fmt.Errorf("Bad exit code. Logfile: %s\n", logfile)
} }
} }
filecontents, err := loadFile("file.txt") filecontents, err := loadFile("file.txt")