mirror of
https://github.com/go-gitea/gitea
synced 2024-11-15 22:54:24 +00:00
b877504b03
This follows * https://github.com/go-gitea/gitea/issues/18553 Introduce `RunWithContextString` and `RunWithContextBytes` to help the refactoring. Add related unit tests. They keep the same behavior to save stderr into err.Error() as `RunInXxx` before. Remove `RunInDirTimeoutPipeline` `RunInDirTimeoutFullPipeline` `RunInDirTimeout` `RunInDirTimeoutEnv` `RunInDirPipeline` `RunInDirFullPipeline` `RunTimeout`, `RunInDirTimeoutEnvPipeline`, `RunInDirTimeoutEnvFullPipeline`, `RunInDirTimeoutEnvFullPipelineFunc`. Then remaining `RunInDir` `RunInDirBytes` `RunInDirWithEnv` can be easily refactored in next PR with a simple search & replace: * before: `stdout, err := RunInDir(path)` * next: `stdout, _, err := RunWithContextString(&git.RunContext{Dir:path})` Other changes: 1. When `timeout <= 0`, use default. Because `timeout==0` is meaningless and could cause bugs. And now many functions becomes more simple, eg: `GitGcRepos` 9 lines to 1 line. `Fsck` 6 lines to 1 line. 2. Only set defaultCommandExecutionTimeout when the option `setting.Git.Timeout.Default > 0`
30 lines
846 B
Go
30 lines
846 B
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package git
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestRunWithContextStd(t *testing.T) {
|
|
cmd := NewCommand(context.Background(), "--version")
|
|
stdout, stderr, err := cmd.RunWithContextString(&RunContext{})
|
|
assert.NoError(t, err)
|
|
assert.Empty(t, stderr)
|
|
assert.Contains(t, stdout, "git version")
|
|
|
|
cmd = NewCommand(context.Background(), "--no-such-arg")
|
|
stdout, stderr, err = cmd.RunWithContextString(&RunContext{})
|
|
if assert.Error(t, err) {
|
|
assert.Equal(t, stderr, err.Stderr())
|
|
assert.Contains(t, err.Stderr(), "unknown option:")
|
|
assert.Contains(t, err.Error(), "exit status 129 - unknown option:")
|
|
assert.Empty(t, stdout)
|
|
}
|
|
}
|