From 5c22b915bb55dfa8850a6a20a60901024cdcf419 Mon Sep 17 00:00:00 2001 From: Danila Fominykh Date: Tue, 31 Oct 2023 20:36:08 -0300 Subject: [PATCH] lint corrections --- modules/packages/arch/metadata.go | 1 + modules/packages/arch/metadata_test.go | 2 +- tests/integration/api_packages_arch_test.go | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/packages/arch/metadata.go b/modules/packages/arch/metadata.go index c64b0c5a2b..379fd81f67 100644 --- a/modules/packages/arch/metadata.go +++ b/modules/packages/arch/metadata.go @@ -19,6 +19,7 @@ import ( "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/validation" + "github.com/mholt/archiver/v3" ) diff --git a/modules/packages/arch/metadata_test.go b/modules/packages/arch/metadata_test.go index b08c4b4163..0f3cede9cc 100644 --- a/modules/packages/arch/metadata_test.go +++ b/modules/packages/arch/metadata_test.go @@ -175,7 +175,7 @@ backup = usr/bin/paket1 } func TestValidatePackageSpec(t *testing.T) { - var newpkg = func() Package { + newpkg := func() Package { return Package{ Name: "abc", Version: "1-1", diff --git a/tests/integration/api_packages_arch_test.go b/tests/integration/api_packages_arch_test.go index c4481a4561..15809215a8 100644 --- a/tests/integration/api_packages_arch_test.go +++ b/tests/integration/api_packages_arch_test.go @@ -32,11 +32,11 @@ func TestPackageArch(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) var ( - gitV1x86_64 = BuildArchPackage(t, "git", "1-1", "x86_64") - gitV1i686 = BuildArchPackage(t, "git", "1-1", "i686") - iconsV1any = BuildArchPackage(t, "icons", "1-1", "any") - gitV2x86_64 = BuildArchPackage(t, "git", "2-1", "x86_64") - iconsV2any = BuildArchPackage(t, "icons", "2-1", "any") + gitV1x86_64 = buildArchPackage(t, "git", "1-1", "x86_64") + gitV1i686 = buildArchPackage(t, "git", "1-1", "i686") + iconsV1any = buildArchPackage(t, "icons", "1-1", "any") + gitV2x86_64 = buildArchPackage(t, "git", "2-1", "x86_64") + iconsV2any = buildArchPackage(t, "icons", "2-1", "any") firstSign = []byte{1, 2, 3, 4} secondSign = []byte{4, 3, 2, 1} @@ -282,7 +282,7 @@ type testArchPackage struct { pkg arch.Package } -func BuildArchPackage(t *testing.T, name, ver, architecture string) testArchPackage { +func buildArchPackage(t *testing.T, name, ver, architecture string) testArchPackage { fs := fstest.MapFS{ "pkginfo": &fstest.MapFile{ Data: []byte(fmt.Sprintf(