From a709867dee38935f1969d370094ba93abcbcffc5 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Mon, 4 Nov 2019 12:47:40 -0800 Subject: [PATCH 1/5] packer: remove unused testComponentFinder() --- packer/core_test.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/packer/core_test.go b/packer/core_test.go index 6df55a47a..bf65f0ffa 100644 --- a/packer/core_test.go +++ b/packer/core_test.go @@ -670,17 +670,6 @@ func TestSensitiveVars(t *testing.T) { } } -func testComponentFinder() *ComponentFinder { - builderFactory := func(n string) (Builder, error) { return new(MockBuilder), nil } - ppFactory := func(n string) (PostProcessor, error) { return new(MockPostProcessor), nil } - provFactory := func(n string) (Provisioner, error) { return new(MockProvisioner), nil } - return &ComponentFinder{ - Builder: builderFactory, - PostProcessor: ppFactory, - Provisioner: provFactory, - } -} - func testCoreTemplate(t *testing.T, c *CoreConfig, p string) { tpl, err := template.ParseFile(p) if err != nil { From 703f071b4a5547bceb905fcdd45df38e2ad9bc62 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Mon, 4 Nov 2019 12:53:16 -0800 Subject: [PATCH 2/5] packer: remove unused test variable --- packer/config_file_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/config_file_test.go b/packer/config_file_test.go index ba275793b..98fa67d99 100644 --- a/packer/config_file_test.go +++ b/packer/config_file_test.go @@ -42,7 +42,7 @@ func TestExpandUser_Empty(t *testing.T) { var path, expected string // Try an invalid user - path, err := ExpandUser("~invalid-user-that-should-not-exist") + _, err := ExpandUser("~invalid-user-that-should-not-exist") if err == nil { t.Fatalf("expected failure") } From 67afbe6fb7a67736956f561c9ab21f6384180f6b Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Mon, 4 Nov 2019 12:54:52 -0800 Subject: [PATCH 3/5] packer: remove bool constant comparisons --- packer/core.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/core.go b/packer/core.go index cae4c39cc..45912f070 100644 --- a/packer/core.go +++ b/packer/core.go @@ -407,7 +407,7 @@ func (c *Core) init() error { } } - if (changed == false) && (shouldRetry == true) { + if !changed && shouldRetry { return fmt.Errorf("Failed to interpolate %s: Please make sure that "+ "the variable you're referencing has been defined; Packer treats "+ "all variables used to interpolate other user varaibles as "+ From 699614b500f6a4cefd2add66a4a694472064eb89 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Mon, 4 Nov 2019 12:58:16 -0800 Subject: [PATCH 4/5] packer/rpc: fix dropped error --- packer/rpc/post_processor_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packer/rpc/post_processor_test.go b/packer/rpc/post_processor_test.go index 1066c8f8b..3338915d2 100644 --- a/packer/rpc/post_processor_test.go +++ b/packer/rpc/post_processor_test.go @@ -112,6 +112,9 @@ func TestPostProcessorRPC_cancel(t *testing.T) { // Test Configure config := 42 err := ppClient.Configure(config) + if err != nil { + t.Fatalf("error configuring post-processor client: %s", err) + } // Test PostProcess a := &packer.MockArtifact{ From a3ca0bc2aa98253afdf207d63c21a5bba60664ff Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Mon, 4 Nov 2019 12:59:55 -0800 Subject: [PATCH 5/5] packer/rpc: remove unused cancelCalled field from testBuild{} --- packer/rpc/build_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/packer/rpc/build_test.go b/packer/rpc/build_test.go index aa19313de..9656c6227 100644 --- a/packer/rpc/build_test.go +++ b/packer/rpc/build_test.go @@ -21,7 +21,6 @@ type testBuild struct { setDebugCalled bool setForceCalled bool setOnErrorCalled bool - cancelCalled bool errRunResult bool }