Skip to content

Commit

Permalink
Fix incorrect test code for error handling (#27139)
Browse files Browse the repository at this point in the history
If `assert.NoError` fails, it should return. Otherwise the code could
still execute even if the error occurs.
  • Loading branch information
wxiaoguang authored Sep 20, 2023
1 parent 1b1c55f commit 2814f2f
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions services/wiki/wiki_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ func TestRepository_AddWikiPage(t *testing.T) {
assert.NoError(t, AddWikiPage(git.DefaultContext, doer, repo, webPath, wikiContent, commitMsg))
// Now need to show that the page has been added:
gitRepo, err := git.OpenRepository(git.DefaultContext, repo.WikiPath())
assert.NoError(t, err)
if !assert.NoError(t, err) {
return
}
defer gitRepo.Close()
masterTree, err := gitRepo.GetTree(DefaultBranch)
assert.NoError(t, err)
Expand Down Expand Up @@ -238,7 +240,9 @@ func TestRepository_DeleteWikiPage(t *testing.T) {

// Now need to show that the page has been added:
gitRepo, err := git.OpenRepository(git.DefaultContext, repo.WikiPath())
assert.NoError(t, err)
if !assert.NoError(t, err) {
return
}
defer gitRepo.Close()
masterTree, err := gitRepo.GetTree(DefaultBranch)
assert.NoError(t, err)
Expand All @@ -251,7 +255,9 @@ func TestPrepareWikiFileName(t *testing.T) {
unittest.PrepareTestEnv(t)
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
gitRepo, err := git.OpenRepository(git.DefaultContext, repo.WikiPath())
assert.NoError(t, err)
if !assert.NoError(t, err) {
return
}
defer gitRepo.Close()

tests := []struct {
Expand Down Expand Up @@ -303,7 +309,9 @@ func TestPrepareWikiFileName_FirstPage(t *testing.T) {
assert.NoError(t, err)

gitRepo, err := git.OpenRepository(git.DefaultContext, tmpDir)
assert.NoError(t, err)
if !assert.NoError(t, err) {
return
}
defer gitRepo.Close()

existence, newWikiPath, err := prepareGitPath(gitRepo, "Home")
Expand Down

0 comments on commit 2814f2f

Please sign in to comment.