From cdcaf038c840247531576a8dd50f30e1615a988c Mon Sep 17 00:00:00 2001 From: Carlos A Becker Date: Thu, 30 Dec 2021 09:47:52 -0300 Subject: [PATCH] test: fixes sbom tests refs #2798 Signed-off-by: Carlos A Becker --- internal/pipe/archive/archive.go | 1 - internal/pipe/sbom/sbom_test.go | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/internal/pipe/archive/archive.go b/internal/pipe/archive/archive.go index 77e45c13ac6..a3da14fbfab 100644 --- a/internal/pipe/archive/archive.go +++ b/internal/pipe/archive/archive.go @@ -14,7 +14,6 @@ import ( "github.com/apex/log" "github.com/goreleaser/fileglob" - "github.com/goreleaser/goreleaser/internal/artifact" "github.com/goreleaser/goreleaser/internal/ids" "github.com/goreleaser/goreleaser/internal/semerrgroup" diff --git a/internal/pipe/sbom/sbom_test.go b/internal/pipe/sbom/sbom_test.go index cad4226d34d..f4fde14a15e 100644 --- a/internal/pipe/sbom/sbom_test.go +++ b/internal/pipe/sbom/sbom_test.go @@ -7,12 +7,10 @@ import ( "sort" "testing" - "github.com/stretchr/testify/assert" - "github.com/goreleaser/goreleaser/internal/artifact" - "github.com/goreleaser/goreleaser/pkg/config" "github.com/goreleaser/goreleaser/pkg/context" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -289,11 +287,9 @@ func TestSBOMCatalogArtifacts(t *testing.T) { ), sbomPaths: []string{ "artifact3-name_1.2.2_linux_amd64.sbom", - "artifact4-name_1.2.2_linux_amd64.sbom", }, sbomNames: []string{ "artifact3-name_1.2.2_linux_amd64.sbom", - "artifact4-name_1.2.2_linux_amd64.sbom", }, }, { @@ -344,13 +340,11 @@ func TestSBOMCatalogArtifacts(t *testing.T) { "artifact1.s2-ish.sbom", "artifact2.s2-ish.sbom", "artifact3-name_1.2.2_linux_amd64.sbom", - "artifact4-name_1.2.2_linux_amd64.sbom", }, sbomNames: []string{ "artifact1.s2-ish.sbom", "artifact2.s2-ish.sbom", "artifact3-name_1.2.2_linux_amd64.sbom", - "artifact4-name_1.2.2_linux_amd64.sbom", }, }, { @@ -398,11 +392,9 @@ func TestSBOMCatalogArtifacts(t *testing.T) { ), sbomPaths: []string{ "artifact3-name.test-user-name.sbom", - "artifact4.test-user-name.sbom", }, sbomNames: []string{ "artifact3-name.test-user-name.sbom", - "artifact4.test-user-name.sbom", }, }, {