From 960651e51085b6e3b1887e9e4c54c88ee2a4d09e Mon Sep 17 00:00:00 2001 From: Mario Trangoni Date: Fri, 9 Nov 2018 19:36:14 +0100 Subject: [PATCH] scripts/build/release_publisher/publisher_test.go: Fix trivial megacheck warning. See, $ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./... scripts/build/release_publisher/publisher_test.go:14:2:warning: should merge variable declaration with assignment on next line (S1021) (megacheck) --- .../build/release_publisher/publisher_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/build/release_publisher/publisher_test.go b/scripts/build/release_publisher/publisher_test.go index ee491ce0b98..22b2bc3a5ba 100644 --- a/scripts/build/release_publisher/publisher_test.go +++ b/scripts/build/release_publisher/publisher_test.go @@ -3,19 +3,20 @@ package main import "testing" func TestPreparingReleaseFromRemote(t *testing.T) { + + var builder releaseBuilder + versionIn := "v5.2.0-beta1" expectedVersion := "5.2.0-beta1" whatsNewUrl := "https://whatsnews.foo/" relNotesUrl := "https://relnotes.foo/" expectedArch := "amd64" expectedOs := "linux" - buildArtifacts := []buildArtifact{{expectedOs,expectedArch, ".linux-amd64.tar.gz"}} - - var builder releaseBuilder + buildArtifacts := []buildArtifact{{expectedOs, expectedArch, ".linux-amd64.tar.gz"}} builder = releaseFromExternalContent{ - getter: mockHttpGetter{}, - rawVersion: versionIn, + getter: mockHttpGetter{}, + rawVersion: versionIn, artifactConfigurations: buildArtifactConfigurations, } @@ -50,7 +51,6 @@ func (mockHttpGetter) getContents(url string) (string, error) { return url, nil } - func TestPreparingReleaseFromLocal(t *testing.T) { whatsNewUrl := "https://whatsnews.foo/" relNotesUrl := "https://relnotes.foo/" @@ -60,7 +60,7 @@ func TestPreparingReleaseFromLocal(t *testing.T) { var builder releaseBuilder testDataPath := "testdata" builder = releaseLocalSources{ - path: testDataPath, + path: testDataPath, artifactConfigurations: buildArtifactConfigurations, } @@ -93,7 +93,7 @@ func TestPreparingReleaseFromLocal(t *testing.T) { expectedOs := "win" builder = releaseLocalSources{ - path: testDataPath, + path: testDataPath, artifactConfigurations: []buildArtifact{{ os: expectedOs, arch: expectedArch,