diff --git a/internal/pipe/env/env_test.go b/internal/pipe/env/env_test.go index 83c04c128..fccf89c6a 100644 --- a/internal/pipe/env/env_test.go +++ b/internal/pipe/env/env_test.go @@ -3,6 +3,7 @@ package env import ( "fmt" "os" + "syscall" "testing" "github.com/goreleaser/goreleaser/internal/testctx" @@ -183,7 +184,9 @@ func TestEmptyGithubEnvFile(t *testing.T) { GitHubToken: f.Name(), }, }) - require.EqualError(t, Pipe{}.Run(ctx), fmt.Sprintf("failed to load github token: open %s: permission denied", f.Name())) + err = Pipe{}.Run(ctx) + require.ErrorIs(t, err, syscall.EACCES) + require.Contains(t, err.Error(), "failed to load github token") } func TestEmptyGitlabEnvFile(t *testing.T) { @@ -196,7 +199,9 @@ func TestEmptyGitlabEnvFile(t *testing.T) { GitLabToken: f.Name(), }, }) - require.EqualError(t, Pipe{}.Run(ctx), fmt.Sprintf("failed to load gitlab token: open %s: permission denied", f.Name())) + err = Pipe{}.Run(ctx) + require.ErrorIs(t, err, syscall.EACCES) + require.Contains(t, err.Error(), "failed to load gitlab token") } func TestEmptyGiteaEnvFile(t *testing.T) { @@ -209,7 +214,9 @@ func TestEmptyGiteaEnvFile(t *testing.T) { GiteaToken: f.Name(), }, }) - require.EqualError(t, Pipe{}.Run(ctx), fmt.Sprintf("failed to load gitea token: open %s: permission denied", f.Name())) + err = Pipe{}.Run(ctx) + require.ErrorIs(t, err, syscall.EACCES) + require.Contains(t, err.Error(), "failed to load gitea token") } func TestInvalidEnvChecksSkipped(t *testing.T) { diff --git a/internal/pipe/metadata/metadata_test.go b/internal/pipe/metadata/metadata_test.go index 4e210b924..c82222abd 100644 --- a/internal/pipe/metadata/metadata_test.go +++ b/internal/pipe/metadata/metadata_test.go @@ -60,8 +60,4 @@ func requireEqualJSONFile(tb testing.TB, tmp, s string) { tb.Helper() path := filepath.Join(tmp, s) golden.RequireEqualJSON(tb, golden.RequireReadFile(tb, path)) - - info, err := os.Stat(path) - require.NoError(tb, err) - require.Equal(tb, "-rw-r--r--", info.Mode().String()) } diff --git a/pkg/archive/tar/tar_test.go b/pkg/archive/tar/tar_test.go index 0b3050fc3..602eccfac 100644 --- a/pkg/archive/tar/tar_test.go +++ b/pkg/archive/tar/tar_test.go @@ -89,8 +89,8 @@ func TestTarFile(t *testing.T) { require.NoError(t, err) paths = append(paths, next.Name) if next.Name == "sub1/executable" { - ex := next.FileInfo().Mode() | 0o111 - require.Equal(t, next.FileInfo().Mode().String(), ex.String()) + ex := next.FileInfo().Mode()&0o111 != 0 + require.True(t, ex, "expected executable permissions, got %s", next.FileInfo().Mode()) } if next.Name == "link.txt" { require.Equal(t, next.Linkname, "regular.txt") diff --git a/pkg/archive/targz/targz_test.go b/pkg/archive/targz/targz_test.go index b83b2bea8..3bed2241f 100644 --- a/pkg/archive/targz/targz_test.go +++ b/pkg/archive/targz/targz_test.go @@ -88,8 +88,8 @@ func TestTarGzFile(t *testing.T) { require.NoError(t, err) paths = append(paths, next.Name) if next.Name == "sub1/executable" { - ex := next.FileInfo().Mode() | 0o111 - require.Equal(t, next.FileInfo().Mode().String(), ex.String()) + ex := next.FileInfo().Mode()&0o111 != 0 + require.True(t, ex, "expected executable permissions, got %s", next.FileInfo().Mode()) } if next.Name == "link.txt" { require.Equal(t, next.Linkname, "regular.txt") diff --git a/pkg/archive/tarxz/tarxz_test.go b/pkg/archive/tarxz/tarxz_test.go index 61b83e55d..534f4ba6b 100644 --- a/pkg/archive/tarxz/tarxz_test.go +++ b/pkg/archive/tarxz/tarxz_test.go @@ -87,8 +87,8 @@ func TestTarXzFile(t *testing.T) { require.NoError(t, err) paths = append(paths, next.Name) if next.Name == "sub1/executable" { - ex := next.FileInfo().Mode() | 0o111 - require.Equal(t, next.FileInfo().Mode().String(), ex.String()) + ex := next.FileInfo().Mode()&0o111 != 0 + require.True(t, ex, "expected executable permissions, got %s", next.FileInfo().Mode()) } if next.Name == "link.txt" { require.Equal(t, next.Linkname, "regular.txt") diff --git a/pkg/archive/zip/zip_test.go b/pkg/archive/zip/zip_test.go index 3da30a92c..af4e7baab 100644 --- a/pkg/archive/zip/zip_test.go +++ b/pkg/archive/zip/zip_test.go @@ -86,8 +86,8 @@ func TestZipFile(t *testing.T) { for i, zf := range r.File { paths[i] = zf.Name if zf.Name == "sub1/executable" { - ex := zf.Mode() | 0o111 - require.Equal(t, zf.Mode().String(), ex.String()) + ex := zf.Mode()&0o111 != 0 + require.True(t, ex, "expected executable permissions, got %s", zf.Mode()) } if zf.Name == "link.txt" { require.True(t, zf.FileInfo().Mode()&os.ModeSymlink != 0)