diff options
| author | Nanguan Lin <70063547+lng2020@users.noreply.github.com> | 2023-10-11 19:02:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-11 11:02:24 +0000 |
| commit | dc04044716088e3786497e200abe1fdfb3a943b6 (patch) | |
| tree | 45230f2067cbf0f130042e33eed36a38ed69e9b1 /modules | |
| parent | dca195e9bd0d14a5cf888524e51175da8ab24588 (diff) | |
| download | gitea-dc04044716088e3786497e200abe1fdfb3a943b6.tar.gz gitea-dc04044716088e3786497e200abe1fdfb3a943b6.zip | |
Replace assert.Fail with assert.FailNow (#27578)
assert.Fail() will continue to execute the code while assert.FailNow()
not. I thought those uses of assert.Fail() should exit immediately.
PS: perhaps it's a good idea to use
[require](https://pkg.go.dev/github.com/stretchr/testify/require)
somewhere because the assert package's default behavior does not exit
when an error occurs, which makes it difficult to find the root error
reason.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/contexttest/context_tests.go | 9 | ||||
| -rw-r--r-- | modules/git/repo_attribute_test.go | 8 | ||||
| -rw-r--r-- | modules/git/repo_tag_test.go | 2 | ||||
| -rw-r--r-- | modules/indexer/code/indexer_test.go | 6 | ||||
| -rw-r--r-- | modules/process/manager_test.go | 4 |
5 files changed, 11 insertions, 18 deletions
diff --git a/modules/contexttest/context_tests.go b/modules/contexttest/context_tests.go index ea91bc5001..8994c1e451 100644 --- a/modules/contexttest/context_tests.go +++ b/modules/contexttest/context_tests.go @@ -83,8 +83,7 @@ func LoadRepo(t *testing.T, ctx gocontext.Context, repoID int64) { ctx.Repo = repo doer = ctx.Doer default: - assert.Fail(t, "context is not *context.Context or *context.APIContext") - return + assert.FailNow(t, "context is not *context.Context or *context.APIContext") } repo.Repository = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: repoID}) @@ -105,8 +104,7 @@ func LoadRepoCommit(t *testing.T, ctx gocontext.Context) { case *context.APIContext: repo = ctx.Repo default: - assert.Fail(t, "context is not *context.Context or *context.APIContext") - return + assert.FailNow(t, "context is not *context.Context or *context.APIContext") } gitRepo, err := git.OpenRepository(ctx, repo.Repository.RepoPath()) @@ -130,8 +128,7 @@ func LoadUser(t *testing.T, ctx gocontext.Context, userID int64) { case *context.APIContext: ctx.Doer = doer default: - assert.Fail(t, "context is not *context.Context or *context.APIContext") - return + assert.FailNow(t, "context is not *context.Context or *context.APIContext") } } diff --git a/modules/git/repo_attribute_test.go b/modules/git/repo_attribute_test.go index 350b69dd25..ed16dccbe4 100644 --- a/modules/git/repo_attribute_test.go +++ b/modules/git/repo_attribute_test.go @@ -27,7 +27,7 @@ func Test_nulSeparatedAttributeWriter_ReadAttribute(t *testing.T) { assert.Equal(t, "linguist-vendored", attr.Attribute) assert.Equal(t, "unspecified", attr.Value) case <-time.After(100 * time.Millisecond): - assert.Fail(t, "took too long to read an attribute from the list") + assert.FailNow(t, "took too long to read an attribute from the list") } // Write a second attribute again n, err = wr.Write([]byte(testStr)) @@ -41,7 +41,7 @@ func Test_nulSeparatedAttributeWriter_ReadAttribute(t *testing.T) { assert.Equal(t, "linguist-vendored", attr.Attribute) assert.Equal(t, "unspecified", attr.Value) case <-time.After(100 * time.Millisecond): - assert.Fail(t, "took too long to read an attribute from the list") + assert.FailNow(t, "took too long to read an attribute from the list") } // Write a partial attribute @@ -52,14 +52,14 @@ func Test_nulSeparatedAttributeWriter_ReadAttribute(t *testing.T) { select { case <-wr.ReadAttribute(): - assert.Fail(t, "There should not be an attribute ready to read") + assert.FailNow(t, "There should not be an attribute ready to read") case <-time.After(100 * time.Millisecond): } _, err = wr.Write([]byte("attribute\x00")) assert.NoError(t, err) select { case <-wr.ReadAttribute(): - assert.Fail(t, "There should not be an attribute ready to read") + assert.FailNow(t, "There should not be an attribute ready to read") case <-time.After(100 * time.Millisecond): } diff --git a/modules/git/repo_tag_test.go b/modules/git/repo_tag_test.go index fb6a7cdd1a..4d94efd1ac 100644 --- a/modules/git/repo_tag_test.go +++ b/modules/git/repo_tag_test.go @@ -71,7 +71,6 @@ func TestRepository_GetTag(t *testing.T) { if lTag == nil { assert.NotNil(t, lTag) assert.FailNow(t, "nil lTag: %s", lTagName) - return } assert.EqualValues(t, lTagName, lTag.Name) assert.EqualValues(t, lTagCommitID, lTag.ID.String()) @@ -105,7 +104,6 @@ func TestRepository_GetTag(t *testing.T) { if aTag == nil { assert.NotNil(t, aTag) assert.FailNow(t, "nil aTag: %s", aTagName) - return } assert.EqualValues(t, aTagName, aTag.Name) assert.EqualValues(t, aTagID, aTag.ID.String()) diff --git a/modules/indexer/code/indexer_test.go b/modules/indexer/code/indexer_test.go index 5b2a97d3d5..5eb8e61e3d 100644 --- a/modules/indexer/code/indexer_test.go +++ b/modules/indexer/code/indexer_test.go @@ -96,11 +96,10 @@ func TestBleveIndexAndSearch(t *testing.T) { idx := bleve.NewIndexer(dir) _, err := idx.Init(context.Background()) if err != nil { - assert.Fail(t, "Unable to create bleve indexer Error: %v", err) if idx != nil { idx.Close() } - return + assert.FailNow(t, "Unable to create bleve indexer Error: %v", err) } defer idx.Close() @@ -118,11 +117,10 @@ func TestESIndexAndSearch(t *testing.T) { indexer := elasticsearch.NewIndexer(u, "gitea_codes") if _, err := indexer.Init(context.Background()); err != nil { - assert.Fail(t, "Unable to init ES indexer Error: %v", err) if indexer != nil { indexer.Close() } - return + assert.FailNow(t, "Unable to init ES indexer Error: %v", err) } defer indexer.Close() diff --git a/modules/process/manager_test.go b/modules/process/manager_test.go index 2e2e35d24a..36b2a912ea 100644 --- a/modules/process/manager_test.go +++ b/modules/process/manager_test.go @@ -50,7 +50,7 @@ func TestManager_Cancel(t *testing.T) { select { case <-ctx.Done(): default: - assert.Fail(t, "Cancel should cancel the provided context") + assert.FailNow(t, "Cancel should cancel the provided context") } finished() @@ -62,7 +62,7 @@ func TestManager_Cancel(t *testing.T) { select { case <-ctx.Done(): default: - assert.Fail(t, "Cancel should cancel the provided context") + assert.FailNow(t, "Cancel should cancel the provided context") } finished() } |