eeafj/golangci-lint
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #969 from danielhelfand/timeout_err_msg

Browse Source 
Change Increase to Increasing in Timeout Exceeded Error Message
This commit is contained in:
Aleksandr Razumov 2020-02-27 19:51:51 +03:00 committed by GitHub
commit 6c2a75eff5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/run.go
View File

@ -446,7 +446,7 @@ func (e *Executor) setTimeoutToDeadlineIfOnlyDeadlineIsSet() {
func (e *Executor) setupExitCode(ctx context.Context) { func (e *Executor) setupExitCode(ctx context.Context) {
if ctx.Err() != nil { if ctx.Err() != nil {
e.exitCode = exitcodes.Timeout e.exitCode = exitcodes.Timeout
e.log.Errorf("Timeout exceeded: try increase it by passing --timeout option") e.log.Errorf("Timeout exceeded: try increasing it by passing --timeout option")
return return
} }

6
test/run_test.go
View File

@ -44,13 +44,13 @@ func TestSymlinkLoop(t *testing.T) {
func TestDeadline(t *testing.T) { func TestDeadline(t *testing.T) {
testshared.NewLintRunner(t).Run("--deadline=1ms", getProjectRoot()). testshared.NewLintRunner(t).Run("--deadline=1ms", getProjectRoot()).
ExpectExitCode(exitcodes.Timeout). ExpectExitCode(exitcodes.Timeout).
ExpectOutputContains(`Timeout exceeded: try increase it by passing --timeout option`) ExpectOutputContains(`Timeout exceeded: try increasing it by passing --timeout option`)
} }
func TestTimeout(t *testing.T) { func TestTimeout(t *testing.T) {
testshared.NewLintRunner(t).Run("--timeout=1ms", getProjectRoot()). testshared.NewLintRunner(t).Run("--timeout=1ms", getProjectRoot()).
ExpectExitCode(exitcodes.Timeout). ExpectExitCode(exitcodes.Timeout).
ExpectOutputContains(`Timeout exceeded: try increase it by passing --timeout option`) ExpectOutputContains(`Timeout exceeded: try increasing it by passing --timeout option`)
} }
func TestTimeoutInConfig(t *testing.T) { func TestTimeoutInConfig(t *testing.T) {
@ -85,7 +85,7 @@ func TestTimeoutInConfig(t *testing.T) {
for _, c := range cases { for _, c := range cases {
// Run with disallowed option set only in config // Run with disallowed option set only in config
r.RunWithYamlConfig(c.cfg, withCommonRunArgs(minimalPkg)...).ExpectExitCode(exitcodes.Timeout). r.RunWithYamlConfig(c.cfg, withCommonRunArgs(minimalPkg)...).ExpectExitCode(exitcodes.Timeout).
ExpectOutputContains(`Timeout exceeded: try increase it by passing --timeout option`) ExpectOutputContains(`Timeout exceeded: try increasing it by passing --timeout option`)
} }
} }