Skip to content

Commit

Permalink
Prevent intermittent failures in RepoIndexerTest (#19225 #19229) (#19228
Browse files Browse the repository at this point in the history
)

Backport #19225
Backport #19229

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.

Fix #19162

Signed-off-by: Andrew Thornton <art27@cantab.net>
  • Loading branch information
zeripath authored Mar 27, 2022
1 parent 2ec2935 commit efd34d0
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions modules/indexer/stats/indexer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@
package stats

import (
"context"
"path/filepath"
"testing"
"time"

repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unittest"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/queue"
"code.gitea.io/gitea/modules/setting"

_ "code.gitea.io/gitea/models"
Expand All @@ -24,6 +27,10 @@ func TestMain(m *testing.M) {
}

func TestRepoStatsIndex(t *testing.T) {
if err := git.Init(context.Background()); !assert.NoError(t, err) {
return
}

assert.NoError(t, unittest.PrepareTestDatabase())
setting.Cfg = ini.Empty()

Expand All @@ -32,10 +39,14 @@ func TestRepoStatsIndex(t *testing.T) {
err := Init()
assert.NoError(t, err)

time.Sleep(5 * time.Second)

repo, err := repo_model.GetRepositoryByID(1)
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)
assert.NoError(t, err)
assert.Equal(t, "65f1bf27bc3bf70f64657658635e66094edbcb4d", status.CommitSha)
Expand Down

0 comments on commit efd34d0

Please sign in to comment.