From 00ed1702a791784aa115c05002787cb90f7bd345 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Mon, 20 May 2019 18:33:31 +0100 Subject: [PATCH 1/3] Fix TestSearchRepo by waiting till indexing is done --- integrations/repo_search_test.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/integrations/repo_search_test.go b/integrations/repo_search_test.go index d7d07ca8d01be..2aee724a439f1 100644 --- a/integrations/repo_search_test.go +++ b/integrations/repo_search_test.go @@ -5,8 +5,12 @@ package integrations import ( + "log" "net/http" "testing" + "time" + + "code.gitea.io/gitea/models" "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" @@ -27,6 +31,23 @@ func resultFilenames(t testing.TB, doc *HTMLDoc) []string { func TestSearchRepo(t *testing.T) { prepareTestEnv(t) + repo, err := models.GetRepositoryByOwnerAndName("user2", "repo1") + assert.NoError(t, err) + + models.UpdateRepoIndexer(repo) + + log.Printf("Waiting for indexing\n") + + i := 0 + for { + if repo.IndexerStatus != nil && len(repo.IndexerStatus.CommitSha) != 0 && i <= 60 { + break + } + time.Sleep(1 * time.Second) + i++ + } + log.Printf("Indexing took: %d s\n", i) + req := NewRequestf(t, "GET", "/user2/repo1/search?q=Description&page=1") resp := MakeRequest(t, req, http.StatusOK) From 56013448148611a70c421b461280ddc0924be69c Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 21 May 2019 07:05:09 +0100 Subject: [PATCH 2/3] Update integrations/repo_search_test.go --- integrations/repo_search_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/repo_search_test.go b/integrations/repo_search_test.go index 2aee724a439f1..d86a4dda049c2 100644 --- a/integrations/repo_search_test.go +++ b/integrations/repo_search_test.go @@ -40,7 +40,7 @@ func TestSearchRepo(t *testing.T) { i := 0 for { - if repo.IndexerStatus != nil && len(repo.IndexerStatus.CommitSha) != 0 && i <= 60 { + if (repo.IndexerStatus != nil && len(repo.IndexerStatus.CommitSha) != 0) || i > 60 { break } time.Sleep(1 * time.Second) From bb51da2fece6303b2f09b6bf8b462b0a20fc64fd Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Tue, 21 May 2019 19:23:12 +0100 Subject: [PATCH 3/3] changes as per @mrsdizzie --- integrations/repo_search_test.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/integrations/repo_search_test.go b/integrations/repo_search_test.go index 2aee724a439f1..3422aeaa126d6 100644 --- a/integrations/repo_search_test.go +++ b/integrations/repo_search_test.go @@ -39,14 +39,18 @@ func TestSearchRepo(t *testing.T) { log.Printf("Waiting for indexing\n") i := 0 - for { - if repo.IndexerStatus != nil && len(repo.IndexerStatus.CommitSha) != 0 && i <= 60 { + for i < 60 { + if repo.IndexerStatus != nil && len(repo.IndexerStatus.CommitSha) != 0 { break } time.Sleep(1 * time.Second) i++ } - log.Printf("Indexing took: %d s\n", i) + if i < 60 { + log.Printf("Indexing took: %ds\n", i) + } else { + log.Printf("Waited the limit: %ds for indexing, continuing\n", i) + } req := NewRequestf(t, "GET", "/user2/repo1/search?q=Description&page=1") resp := MakeRequest(t, req, http.StatusOK)