Skip to content

Commit

Permalink
Merge pull request #44 from golangci/support/exit-code-4-if-deadline
Browse files Browse the repository at this point in the history
#41: exit with code 4 if timeouted
  • Loading branch information
golangci committed May 30, 2018
2 parents 199d460 + b28bf5f commit 3b5ee0c
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 4 deletions.
9 changes: 8 additions & 1 deletion pkg/commands/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ import (
"golang.org/x/tools/go/loader"
)

const exitCodeIfFailure = 3
const (
exitCodeIfFailure = 3
exitCodeIfTimeout = 4
)

func (e *Executor) initRun() {
var runCmd = &cobra.Command{
Expand Down Expand Up @@ -388,6 +391,10 @@ func (e *Executor) executeRun(cmd *cobra.Command, args []string) {
e.exitCode = exitCodeIfFailure
}
}

if e.exitCode == 0 && ctx.Err() != nil {
e.exitCode = exitCodeIfTimeout
}
}

func (e *Executor) parseConfig(cmd *cobra.Command) {
Expand Down
38 changes: 35 additions & 3 deletions pkg/enabled_linters_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (
"runtime"
"strconv"
"strings"
"sync"
"syscall"
"testing"
"time"

Expand All @@ -20,6 +22,15 @@ import (
"github.com/stretchr/testify/assert"
)

var installOnce sync.Once

func installBinary(t assert.TestingT) {
installOnce.Do(func() {
cmd := exec.Command("go", "install", filepath.Join("..", "cmd", binName))
assert.NoError(t, cmd.Run(), "Can't go install %s", binName)
})
}

func runGoErrchk(c *exec.Cmd, t *testing.T) {
output, err := c.CombinedOutput()
assert.NoError(t, err, "Output:\n%s", output)
Expand Down Expand Up @@ -51,9 +62,30 @@ func TestSourcesFromTestdataWithIssuesDir(t *testing.T) {
}
}

func installBinary(t assert.TestingT) {
cmd := exec.Command("go", "install", filepath.Join("..", "cmd", binName))
assert.NoError(t, cmd.Run(), "Can't go install %s", binName)
func TestDeadlineExitCode(t *testing.T) {
installBinary(t)

exitCode := runGolangciLintGetExitCode(t, "--no-config", "--deadline=1ms")
assert.Equal(t, 4, exitCode)
}

func runGolangciLintGetExitCode(t *testing.T, args ...string) int {
runArgs := append([]string{"run"}, args...)
cmd := exec.Command("golangci-lint", runArgs...)
err := cmd.Run()
if err != nil {
if exitError, ok := err.(*exec.ExitError); ok {
ws := exitError.Sys().(syscall.WaitStatus)
return ws.ExitStatus()
}

t.Fatalf("can't get error code from %s", err)
return -1
}

// success, exitCode should be 0 if go is ok
ws := cmd.ProcessState.Sys().(syscall.WaitStatus)
return ws.ExitStatus()
}

func testOneSource(t *testing.T, sourcePath string) {
Expand Down

0 comments on commit 3b5ee0c

Please sign in to comment.