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

fix tests and add a few new ones

Browse Source
pull/7463/head
Megan Marsh 7 years ago
parent 365b32eb9c
commit 056fcb7cea
9 changed files with 101 additions and 24 deletions
Show Stats Download Patch File Download Diff File

76
packer/build_test.go
Unescape View File

@ -5,6 +5,10 @@ import (
"testing"
)
func boolPointer(tf bool) *bool {
return &tf
}
func testBuild() *coreBuild {
return &coreBuild{
name: "test",
@ -19,7 +23,7 @@ func testBuild() *coreBuild {
},
postProcessors: [][]coreBuildPostProcessor{
{
{&MockPostProcessor{ArtifactId: "pp"}, "testPP", make(map[string]interface{}), true},
{&MockPostProcessor{ArtifactId: "pp"}, "testPP", make(map[string]interface{}), boolPointer(true)},
},
},
variables: make(map[string]string),
@ -245,7 +249,7 @@ func TestBuild_Run_Artifacts(t *testing.T) {
build = testBuild()
build.postProcessors = [][]coreBuildPostProcessor{
{
{&MockPostProcessor{ArtifactId: "pp"}, "pp", make(map[string]interface{}), false},
{&MockPostProcessor{ArtifactId: "pp"}, "pp", make(map[string]interface{}), boolPointer(false)},
},
}
@ -270,10 +274,10 @@ func TestBuild_Run_Artifacts(t *testing.T) {
build = testBuild()
build.postProcessors = [][]coreBuildPostProcessor{
{
{&MockPostProcessor{ArtifactId: "pp1"}, "pp", make(map[string]interface{}), false},
{&MockPostProcessor{ArtifactId: "pp1"}, "pp", make(map[string]interface{}), boolPointer(false)},
},
{
{&MockPostProcessor{ArtifactId: "pp2"}, "pp", make(map[string]interface{}), true},
{&MockPostProcessor{ArtifactId: "pp2"}, "pp", make(map[string]interface{}), boolPointer(true)},
},
}
@ -298,12 +302,12 @@ func TestBuild_Run_Artifacts(t *testing.T) {
build = testBuild()
build.postProcessors = [][]coreBuildPostProcessor{
{
{&MockPostProcessor{ArtifactId: "pp1a"}, "pp", make(map[string]interface{}), false},
{&MockPostProcessor{ArtifactId: "pp1b"}, "pp", make(map[string]interface{}), true},
{&MockPostProcessor{ArtifactId: "pp1a"}, "pp", make(map[string]interface{}), boolPointer(false)},
{&MockPostProcessor{ArtifactId: "pp1b"}, "pp", make(map[string]interface{}), boolPointer(true)},
},
{
{&MockPostProcessor{ArtifactId: "pp2a"}, "pp", make(map[string]interface{}), false},
{&MockPostProcessor{ArtifactId: "pp2b"}, "pp", make(map[string]interface{}), false},
{&MockPostProcessor{ArtifactId: "pp2a"}, "pp", make(map[string]interface{}), boolPointer(false)},
{&MockPostProcessor{ArtifactId: "pp2b"}, "pp", make(map[string]interface{}), boolPointer(false)},
},
}
@ -329,7 +333,61 @@ func TestBuild_Run_Artifacts(t *testing.T) {
build.postProcessors = [][]coreBuildPostProcessor{
{
{
&MockPostProcessor{ArtifactId: "pp", Keep: true}, "pp", make(map[string]interface{}), false,
&MockPostProcessor{ArtifactId: "pp", Keep: true, ForceOverride: true}, "pp", make(map[string]interface{}), boolPointer(false),
},
},
}
build.Prepare()
artifacts, err = build.Run(ui)
if err != nil {
t.Fatalf("err: %s", err)
}
expectedIds = []string{"b", "pp"}
artifactIds = make([]string, len(artifacts))
for i, artifact := range artifacts {
artifactIds[i] = artifact.Id()
}
if !reflect.DeepEqual(artifactIds, expectedIds) {
t.Fatalf("unexpected ids: %#v", artifactIds)
}
// Test case: Test that with a single post-processor that non-forcibly
// keeps inputs, that the artifacts are discarded if user overrides.
build = testBuild()
build.postProcessors = [][]coreBuildPostProcessor{
{
{
&MockPostProcessor{ArtifactId: "pp", Keep: true, ForceOverride: false}, "pp", make(map[string]interface{}), boolPointer(false),
},
},
}
build.Prepare()
artifacts, err = build.Run(ui)
if err != nil {
t.Fatalf("err: %s", err)
}
expectedIds = []string{"pp"}
artifactIds = make([]string, len(artifacts))
for i, artifact := range artifacts {
artifactIds[i] = artifact.Id()
}
if !reflect.DeepEqual(artifactIds, expectedIds) {
t.Fatalf("unexpected ids: %#v", artifactIds)
}
// Test case: Test that with a single post-processor that non-forcibly
// keeps inputs, that the artifacts are kept if user does not have preference.
build = testBuild()
build.postProcessors = [][]coreBuildPostProcessor{
{
{
&MockPostProcessor{ArtifactId: "pp", Keep: true, ForceOverride: false}, "pp", make(map[string]interface{}), nil,
},
},
}

4
packer/plugin/post_processor_test.go
Unescape View File

@ -13,8 +13,8 @@ func (helperPostProcessor) Configure(...interface{}) error {
return nil
}
func (helperPostProcessor) PostProcess(packer.Ui, packer.Artifact) (packer.Artifact, bool, error) {
return nil, false, nil
func (helperPostProcessor) PostProcess(packer.Ui, packer.Artifact) (packer.Artifact, bool, bool, error) {
return nil, false, false, nil
}
func TestPostProcessor_NoExist(t *testing.T) {

6
packer/rpc/post_processor_test.go
Unescape View File

@ -24,12 +24,12 @@ func (pp *TestPostProcessor) Configure(v ...interface{}) error {
return nil
}
func (pp *TestPostProcessor) PostProcess(ui packer.Ui, a packer.Artifact) (packer.Artifact, bool, error) {
func (pp *TestPostProcessor) PostProcess(ui packer.Ui, a packer.Artifact) (packer.Artifact, bool, bool, error) {
pp.ppCalled = true
pp.ppArtifact = a
pp.ppArtifactId = a.Id()
pp.ppUi = ui
return testPostProcessorArtifact, false, nil
return testPostProcessorArtifact, false, false, nil
}
func TestPostProcessorRPC(t *testing.T) {
@ -65,7 +65,7 @@ func TestPostProcessorRPC(t *testing.T) {
IdValue: "ppTestId",
}
ui := new(testUi)
artifact, _, err := ppClient.PostProcess(ui, a)
artifact, _, _, err := ppClient.PostProcess(ui, a)
if err != nil {
t.Fatalf("err: %s", err)
}

2
post-processor/checksum/post-processor_test.go
Unescape View File

@ -98,7 +98,7 @@ func testChecksum(t *testing.T, config string) packer.Artifact {
checksum.config.PackerBuildName = "vanilla"
checksum.config.PackerBuilderType = "file"
artifactOut, _, err := checksum.PostProcess(ui, artifact)
artifactOut, _, _, err := checksum.PostProcess(ui, artifact)
if err != nil {
t.Fatalf("Failed to checksum artifact: %s", err)
}

2
post-processor/compress/post-processor_test.go
Unescape View File

@ -238,7 +238,7 @@ func testArchive(t *testing.T, config string) packer.Artifact {
compressor.config.PackerBuildName = "vanilla"
compressor.config.PackerBuilderType = "file"
artifactOut, _, err := compressor.PostProcess(ui, artifact)
artifactOut, _, _, err := compressor.PostProcess(ui, artifact)
if err != nil {
t.Fatalf("Failed to compress artifact: %s", err)
}

15
post-processor/docker-push/post-processor_test.go
Unescape View File

@ -41,13 +41,16 @@ func TestPostProcessor_PostProcess(t *testing.T) {
IdValue: "foo/bar",
}
result, keep, err := p.PostProcess(testUi(), artifact)
result, keep, forceOverride, err := p.PostProcess(testUi(), artifact)
if _, ok := result.(packer.Artifact); !ok {
t.Fatal("should be instance of Artifact")
}
if !keep {
t.Fatal("should keep")
}
if forceOverride {
t.Fatal("Should default to keep, but not override user wishes")
}
if err != nil {
t.Fatalf("err: %s", err)
}
@ -71,13 +74,16 @@ func TestPostProcessor_PostProcess_portInName(t *testing.T) {
IdValue: "localhost:5000/foo/bar",
}
result, keep, err := p.PostProcess(testUi(), artifact)
result, keep, forceOverride, err := p.PostProcess(testUi(), artifact)
if _, ok := result.(packer.Artifact); !ok {
t.Fatal("should be instance of Artifact")
}
if !keep {
t.Fatal("should keep")
}
if forceOverride {
t.Fatal("Should default to keep, but not override user wishes")
}
if err != nil {
t.Fatalf("err: %s", err)
}
@ -101,13 +107,16 @@ func TestPostProcessor_PostProcess_tags(t *testing.T) {
IdValue: "hashicorp/ubuntu:precise",
}
result, keep, err := p.PostProcess(testUi(), artifact)
result, keep, forceOverride, err := p.PostProcess(testUi(), artifact)
if _, ok := result.(packer.Artifact); !ok {
t.Fatal("should be instance of Artifact")
}
if !keep {
t.Fatal("should keep")
}
if forceOverride {
t.Fatal("Should default to keep, but not override user wishes")
}
if err != nil {
t.Fatalf("err: %s", err)
}

10
post-processor/docker-tag/post-processor_test.go
Unescape View File

@ -48,13 +48,16 @@ func TestPostProcessor_PostProcess(t *testing.T) {
IdValue: "1234567890abcdef",
}
result, keep, err := p.PostProcess(testUi(), artifact)
result, keep, forceOverride, err := p.PostProcess(testUi(), artifact)
if _, ok := result.(packer.Artifact); !ok {
t.Fatal("should be instance of Artifact")
}
if !keep {
t.Fatal("should keep")
}
if !forceOverride {
t.Fatal("Should force keep no matter what user sets.")
}
if err != nil {
t.Fatalf("err: %s", err)
}
@ -87,13 +90,16 @@ func TestPostProcessor_PostProcess_Force(t *testing.T) {
IdValue: "1234567890abcdef",
}
result, keep, err := p.PostProcess(testUi(), artifact)
result, keep, forceOverride, err := p.PostProcess(testUi(), artifact)
if _, ok := result.(packer.Artifact); !ok {
t.Fatal("should be instance of Artifact")
}
if !keep {
t.Fatal("should keep")
}
if !forceOverride {
t.Fatal("Should force keep no matter what user sets.")
}
if err != nil {
t.Fatalf("err: %s", err)
}

4
post-processor/vagrant/post-processor_test.go
Unescape View File

@ -151,7 +151,7 @@ func TestPostProcessorPostProcess_badId(t *testing.T) {
BuilderIdValue: "invalid.packer",
}
_, _, err := testPP(t).PostProcess(testUi(), artifact)
_, _, _, err := testPP(t).PostProcess(testUi(), artifact)
if !strings.Contains(err.Error(), "artifact type") {
t.Fatalf("err: %s", err)
}
@ -181,7 +181,7 @@ func TestPostProcessorPostProcess_vagrantfileUserVariable(t *testing.T) {
a := &packer.MockArtifact{
BuilderIdValue: "packer.parallels",
}
a2, _, err := p.PostProcess(testUi(), a)
a2, _, _, err := p.PostProcess(testUi(), a)
if a2 != nil {
for _, fn := range a2.Files() {
defer os.Remove(fn)

6
template/parse_test.go
Unescape View File

@ -14,6 +14,10 @@ import (
"github.com/google/go-cmp/cmp"
)
func boolPointer(tf bool) *bool {
return &tf
}
func TestParse(t *testing.T) {
cases := []struct {
File string
@ -205,7 +209,7 @@ func TestParse(t *testing.T) {
{
Name: "foo",
Type: "foo",
KeepInputArtifact: true,
KeepInputArtifact: boolPointer(true),
},
},
},

Write Preview
Loading…
Cancel
Save