queue is sync in tests

modules/indexer/code/indexer.go

@@ -311,11 +311,3 @@ func populateRepoIndexer(ctx context.Context) {
  }
  log.Info("Done (re)populating the repo indexer with existing repositories")
 }
-
-// GetQueueItemNumber is used in integration tests
-func GetQueueItemNumber() int {
- if indexerQueue != nil {
- return indexerQueue.GetQueueItemNumber()
- }
- return -1
-}

tests/integration/repo_search_test.go

@@ -6,7 +6,6 @@ package integration
 import (
  "net/http"
  "testing"
- "time"
 
  "code.gitea.io/gitea/models/db"
  repo_model "code.gitea.io/gitea/models/repo"
@@ -33,7 +32,7 @@ func TestSearchRepo(t *testing.T) {
  repo, err := repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, "user2", "repo1")
  assert.NoError(t, err)
 
- executeIndexer(t, repo)
+ code_indexer.UpdateRepoIndexer(repo)
 
  testSearch(t, "/user2/repo1/search?q=Description&page=1", []string{"README.md"})
 
@@ -43,7 +42,7 @@ func TestSearchRepo(t *testing.T) {
  repo, err = repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, "user2", "glob")
  assert.NoError(t, err)
 
- executeIndexer(t, repo)
+ code_indexer.UpdateRepoIndexer(repo)
 
  testSearch(t, "/user2/glob/search?q=loren&page=1", []string{"a.txt"})
  testSearch(t, "/user2/glob/search?q=loren&page=1&t=match", []string{"a.txt"})
@@ -60,18 +59,3 @@ func testSearch(t *testing.T, url string, expected []string) {
  filenames := resultFilenames(t, NewHTMLParser(t, resp.Body))
  assert.EqualValues(t, expected, filenames)
 }
-
-func executeIndexer(t *testing.T, repo *repo_model.Repository) {
- code_indexer.UpdateRepoIndexer(repo)
-
- for {
- number := code_indexer.GetQueueItemNumber()
- if number == 0 {
- return
- }
- if number == -1 {
- t.Fatal("Indexing failed")
- }
- time.Sleep(10 * time.Millisecond)
- }
-}