diff options
| author | zeripath <art27@cantab.net> | 2022-03-27 08:05:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 15:05:01 +0800 |
| commit | 793ce9dacff6bd25ea2c90af9db230768b1dc240 (patch) | |
| tree | 3fcafda80b9d27f29dca92c27259aea86cdd87f9 /modules/indexer | |
| parent | f3165824585b55c0bd75cb4f46120fca8b4ace9f (diff) | |
| download | gitea-793ce9dacff6bd25ea2c90af9db230768b1dc240.tar.gz gitea-793ce9dacff6bd25ea2c90af9db230768b1dc240.zip | |
Prevent intermittent failures in RepoIndexerTest (#19225)
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>
Diffstat (limited to 'modules/indexer')
| -rw-r--r-- | modules/indexer/stats/indexer_test.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/modules/indexer/stats/indexer_test.go b/modules/indexer/stats/indexer_test.go index 50c6cc38e9..03b5e61fdc 100644 --- a/modules/indexer/stats/indexer_test.go +++ b/modules/indexer/stats/indexer_test.go @@ -5,12 +5,14 @@ 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/queue" "code.gitea.io/gitea/modules/setting" _ "code.gitea.io/gitea/models" @@ -32,10 +34,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) |