mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-10-31 22:38:49 +00:00
Don't parse forge config files multiple times if no error occured (#4272)
This commit is contained in:
parent
bd933669ef
commit
87bfe95c43
2 changed files with 5 additions and 6 deletions
|
@ -59,10 +59,9 @@ func (f *forgeFetcher) Fetch(ctx context.Context, forge forge.Forge, user *model
|
|||
for i := 0; i < int(f.retryCount); i++ {
|
||||
files, err = ffc.fetch(ctx, strings.TrimSpace(repo.Config))
|
||||
if err != nil {
|
||||
log.Trace().Err(err).Msgf("Attempt #%d failed", i+1)
|
||||
}
|
||||
if errors.Is(err, context.DeadlineExceeded) {
|
||||
continue
|
||||
log.Trace().Err(err).Msgf("Fetching config files: Attempt #%d failed", i+1)
|
||||
} else {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -287,7 +287,7 @@ func TestFetch(t *testing.T) {
|
|||
f := new(mocks.Forge)
|
||||
dirs := map[string][]*forge_types.FileMeta{}
|
||||
for _, file := range tt.files {
|
||||
f.On("File", mock.Anything, mock.Anything, mock.Anything, mock.Anything, file.name).Return(file.data, nil)
|
||||
f.On("File", mock.Anything, mock.Anything, mock.Anything, mock.Anything, file.name).Once().Return(file.data, nil)
|
||||
path := filepath.Dir(file.name)
|
||||
if path != "." {
|
||||
dirs[path] = append(dirs[path], &forge_types.FileMeta{
|
||||
|
@ -298,7 +298,7 @@ func TestFetch(t *testing.T) {
|
|||
}
|
||||
|
||||
for path, files := range dirs {
|
||||
f.On("Dir", mock.Anything, mock.Anything, mock.Anything, mock.Anything, path).Return(files, nil)
|
||||
f.On("Dir", mock.Anything, mock.Anything, mock.Anything, mock.Anything, path).Once().Return(files, nil)
|
||||
}
|
||||
|
||||
// if the previous mocks do not match return not found errors
|
||||
|
|
Loading…
Reference in a new issue