test(pipe): fix tests cleanup (#4636)

goreleaser · Feb 17, 2024 · dab740d · dab740d
1 parent 554ca5f
commit dab740d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -15,6 +15,7 @@ linters:
     - misspell
     - depguard
     - testifylint
+    - gocritic
 linters-settings:
   staticcheck:
     checks:
@@ -35,3 +36,6 @@ linters-settings:
         deny:
           - pkg: "github.com/pkg/errors"
             desc: "use stdlib instead"
+  gocritic:
+    enabled-checks:
+      - exitAfterDefer
diff --git a/internal/pipe/before/before_test.go b/internal/pipe/before/before_test.go
@@ -15,8 +15,9 @@ import (
 
 func TestMain(m *testing.M) {
 	log.SetLevel(log.DebugLevel)
-	defer log.SetLevel(log.InfoLevel)
-	os.Exit(m.Run())
+	code := m.Run()
+	log.SetLevel(log.InfoLevel)
+	os.Exit(code)
 }
 
 func TestDescription(t *testing.T) {

diff --git a/internal/pipe/sign/sign_test.go b/internal/pipe/sign/sign_test.go
@@ -46,8 +46,9 @@ func TestMain(m *testing.M) {
 		os.Exit(1)
 	}
 
-	defer os.RemoveAll(keyring)
-	os.Exit(m.Run())
+	code := m.Run()
+	_ = os.RemoveAll(keyring)
+	os.Exit(code)
 }
 
 func TestDescription(t *testing.T) {