MarcoBuster/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-22 18:57:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent intermittent failures in RepoIndexerTest (#19225)

Browse Source 
The RepoIndexerTest is failing with considerable frequency due to a race inherrent in
its design. This PR adjust this test to avoid the reliance on waiting for the populate
repo indexer to run and forcibly adds the repo to the queue. It then flushes the queue.

It may be worth separating out the tests somewhat by testing the Index function
directly away from the queue however, this forceful method should solve the current
problem.

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2022-03-27 08:05:01 +01:00 committed by GitHub
parent f316582458
commit 793ce9dacf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/indexer/stats/indexer_test.go
View File

@ -5,12 +5,14 @@
package stats package stats
import ( import (
"context"
"path/filepath" "path/filepath"
"testing" "testing"
"time" "time"
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/models/unittest"
"code.gitea.io/gitea/modules/queue"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
_ "code.gitea.io/gitea/models" _ "code.gitea.io/gitea/models"
@ -32,10 +34,14 @@ func TestRepoStatsIndex(t *testing.T) {
err := Init() err := Init()
assert.NoError(t, err) assert.NoError(t, err)
time.Sleep(5 * time.Second)
repo, err := repo_model.GetRepositoryByID(1) repo, err := repo_model.GetRepositoryByID(1)
assert.NoError(t, err) assert.NoError(t, err)
err = UpdateRepoIndexer(repo)
assert.NoError(t, err)
queue.GetManager().FlushAll(context.Background(), 5*time.Second)
status, err := repo_model.GetIndexerStatus(repo, repo_model.RepoIndexerTypeStats) status, err := repo_model.GetIndexerStatus(repo, repo_model.RepoIndexerTypeStats)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "65f1bf27bc3bf70f64657658635e66094edbcb4d", status.CommitSha) assert.Equal(t, "65f1bf27bc3bf70f64657658635e66094edbcb4d", status.CommitSha)