upstream/packer
1
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-06-10 17:20:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove tmp files created by builder/googlecompute tests

Browse source
This commit is contained in:
DanHam 2018-04-30 20:36:48 +01:00
parent 9b6fc5a58d
commit 5642f8cb01
No known key found for this signature in database
GPG key ID: 58E79AEDD6AA987E
3 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
builder/googlecompute/config_test.go
View file

@ -3,6 +3,7 @@ package googlecompute
import (
"fmt"
"io/ioutil"
"os"
"strings"
"testing"
)
@ -199,7 +200,8 @@ func TestConfigPrepare(t *testing.T) {
}
for _, tc := range cases {
raw := testConfig(t)
raw, tempfile := testConfig(t)
defer os.Remove(tempfile)
if tc.Value == nil {
delete(raw, tc.Key)
@ -251,7 +253,8 @@ func TestConfigPrepareAccelerator(t *testing.T) {
}
for _, tc := range cases {
raw := testConfig(t)
raw, tempfile := testConfig(t)
defer os.Remove(tempfile)
errStr := ""
for k := range tc.Keys {
@ -300,7 +303,8 @@ func TestConfigPrepareServiceAccount(t *testing.T) {
}
for _, tc := range cases {
raw := testConfig(t)
raw, tempfile := testConfig(t)
defer os.Remove(tempfile)
errStr := ""
for k := range tc.Keys {
@ -342,7 +346,8 @@ func TestConfigDefaults(t *testing.T) {
}
for _, tc := range cases {
raw := testConfig(t)
raw, tempfile := testConfig(t)
defer os.Remove(tempfile)
c, warns, errs := NewConfig(raw)
testConfigOk(t, warns, errs)
@ -355,7 +360,10 @@ func TestConfigDefaults(t *testing.T) {
}
func TestImageName(t *testing.T) {
c, _, _ := NewConfig(testConfig(t))
raw, tempfile := testConfig(t)
defer os.Remove(tempfile)
c, _, _ := NewConfig(raw)
if !strings.HasPrefix(c.ImageName, "packer-") {
t.Fatalf("ImageName should have 'packer-' prefix, found %s", c.ImageName)
}
@ -365,7 +373,10 @@ func TestImageName(t *testing.T) {
}
func TestRegion(t *testing.T) {
c, _, _ := NewConfig(testConfig(t))
raw, tempfile := testConfig(t)
defer os.Remove(tempfile)
c, _, _ := NewConfig(raw)
if c.Region != "us-east1" {
t.Fatalf("Region should be 'us-east1' given Zone of 'us-east1-a', but is %s", c.Region)
}
@ -373,9 +384,11 @@ func TestRegion(t *testing.T) {
// Helper stuff below
func testConfig(t *testing.T) map[string]interface{} {
return map[string]interface{}{
"account_file": testAccountFile(t),
func testConfig(t *testing.T) (config map[string]interface{}, tempAccountFile string) {
tempAccountFile = testAccountFile(t)
config = map[string]interface{}{
"account_file": tempAccountFile,
"project_id": "hashicorp",
"source_image": "foo",
"ssh_username": "root",
@ -389,10 +402,15 @@ func testConfig(t *testing.T) map[string]interface{} {
},
"zone": "us-east1-a",
}
return config, tempAccountFile
}
func testConfigStruct(t *testing.T) *Config {
c, warns, errs := NewConfig(testConfig(t))
raw, tempfile := testConfig(t)
defer os.Remove(tempfile)
c, warns, errs := NewConfig(raw)
if len(warns) > 0 {
t.Fatalf("bad: %#v", len(warns))
}

1
builder/googlecompute/step_create_ssh_key_test.go
View file

@ -55,6 +55,7 @@ func TestStepCreateSSHKey_debug(t *testing.T) {
if err != nil {
t.Fatalf("err: %s", err)
}
defer os.Remove(tf.Name())
tf.Close()
state := testState(t)

1
builder/googlecompute/step_create_windows_password_test.go
View file

@ -75,6 +75,7 @@ func TestStepCreateOrResetWindowsPassword_debug(t *testing.T) {
if err != nil {
t.Fatalf("err: %s", err)
}
defer os.Remove(tf.Name())
tf.Close()
state := testState(t)