diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2020-09-07 23:05:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 23:05:08 +0800 |
| commit | 91e7ad569ac9590b521e5c4fdfb2162f528db49f (patch) | |
| tree | 675316438ca6d716b87849dcf23f5ecd772176d5 /integrations | |
| parent | a722dd72db7fb6efd9ec0bf730d6b2364ef6337c (diff) | |
| download | gitea-91e7ad569ac9590b521e5c4fdfb2162f528db49f.tar.gz gitea-91e7ad569ac9590b521e5c4fdfb2162f528db49f.zip | |
Add queue for code indexer (#10332)
* Add queue for code indexer
* Fix lint
* Fix test
* Fix lint
* Fix bug
* Fix bug
* Fix lint
* Add noqueue
* Fix tests
* Rename noqueue to immediate
Diffstat (limited to 'integrations')
| -rw-r--r-- | integrations/mssql.ini.tmpl | 3 | ||||
| -rw-r--r-- | integrations/mysql.ini.tmpl | 3 | ||||
| -rw-r--r-- | integrations/mysql8.ini.tmpl | 3 | ||||
| -rw-r--r-- | integrations/pgsql.ini.tmpl | 3 | ||||
| -rw-r--r-- | integrations/repo_search_test.go | 13 | ||||
| -rw-r--r-- | integrations/sqlite.ini.tmpl | 3 |
6 files changed, 17 insertions, 11 deletions
diff --git a/integrations/mssql.ini.tmpl b/integrations/mssql.ini.tmpl index a8fbbe7fe5..cfb3594126 100644 --- a/integrations/mssql.ini.tmpl +++ b/integrations/mssql.ini.tmpl @@ -14,6 +14,9 @@ ISSUE_INDEXER_PATH = integrations/indexers-mssql/issues.bleve REPO_INDEXER_ENABLED = true REPO_INDEXER_PATH = integrations/indexers-mssql/repos.bleve +[queue.code_indexer] +TYPE = immediate + [repository] ROOT = {{REPO_TEST_DIR}}integrations/gitea-integration-mssql/gitea-repositories diff --git a/integrations/mysql.ini.tmpl b/integrations/mysql.ini.tmpl index 5691311660..8e3d2b3f14 100644 --- a/integrations/mysql.ini.tmpl +++ b/integrations/mysql.ini.tmpl @@ -16,6 +16,9 @@ ISSUE_INDEXER_PATH = integrations/indexers-mysql/issues.bleve REPO_INDEXER_ENABLED = true REPO_INDEXER_PATH = integrations/indexers-mysql/repos.bleve +[queue.code_indexer] +TYPE = immediate + [repository] ROOT = {{REPO_TEST_DIR}}integrations/gitea-integration-mysql/gitea-repositories diff --git a/integrations/mysql8.ini.tmpl b/integrations/mysql8.ini.tmpl index a135ecb981..ca77babf4b 100644 --- a/integrations/mysql8.ini.tmpl +++ b/integrations/mysql8.ini.tmpl @@ -14,6 +14,9 @@ ISSUE_INDEXER_PATH = integrations/indexers-mysql8/issues.bleve REPO_INDEXER_ENABLED = true REPO_INDEXER_PATH = integrations/indexers-mysql8/repos.bleve +[queue.code_indexer] +TYPE = immediate + [repository] ROOT = {{REPO_TEST_DIR}}integrations/gitea-integration-mysql8/gitea-repositories diff --git a/integrations/pgsql.ini.tmpl b/integrations/pgsql.ini.tmpl index 4cac2585fb..802296cf63 100644 --- a/integrations/pgsql.ini.tmpl +++ b/integrations/pgsql.ini.tmpl @@ -15,6 +15,9 @@ ISSUE_INDEXER_PATH = integrations/indexers-pgsql/issues.bleve REPO_INDEXER_ENABLED = true REPO_INDEXER_PATH = integrations/indexers-pgsql/repos.bleve +[queue.code_indexer] +TYPE = immediate + [repository] ROOT = {{REPO_TEST_DIR}}integrations/gitea-integration-pgsql/gitea-repositories diff --git a/integrations/repo_search_test.go b/integrations/repo_search_test.go index 701013735c..6f2ee37460 100644 --- a/integrations/repo_search_test.go +++ b/integrations/repo_search_test.go @@ -7,7 +7,6 @@ package integrations import ( "net/http" "testing" - "time" "code.gitea.io/gitea/models" code_indexer "code.gitea.io/gitea/modules/indexer/code" @@ -62,14 +61,6 @@ func testSearch(t *testing.T, url string, expected []string) { assert.EqualValues(t, expected, filenames) } -func executeIndexer(t *testing.T, repo *models.Repository, op func(*models.Repository, ...chan<- error)) { - waiter := make(chan error, 1) - op(repo, waiter) - - select { - case err := <-waiter: - assert.NoError(t, err) - case <-time.After(1 * time.Minute): - assert.Fail(t, "Repository indexer took too long") - } +func executeIndexer(t *testing.T, repo *models.Repository, op func(*models.Repository)) { + op(repo) } diff --git a/integrations/sqlite.ini.tmpl b/integrations/sqlite.ini.tmpl index e899328c81..5d54c5f9fa 100644 --- a/integrations/sqlite.ini.tmpl +++ b/integrations/sqlite.ini.tmpl @@ -10,6 +10,9 @@ ISSUE_INDEXER_PATH = integrations/indexers-sqlite/issues.bleve REPO_INDEXER_ENABLED = true REPO_INDEXER_PATH = integrations/indexers-sqlite/repos.bleve +[queue.code_indexer] +TYPE = immediate + [repository] ROOT = {{REPO_TEST_DIR}}integrations/gitea-integration-sqlite/gitea-repositories |