Browse Source

Fix incorrect test code for error handling (#27139)

If `assert.NoError` fails, it should return. Otherwise the code could
still execute even if the error occurs.
tags/v1.21.0-rc0
wxiaoguang 8 months ago
parent
commit
2814f2fea1
No account linked to committer's email address
1 changed files with 12 additions and 4 deletions
  1. 12
    4
      services/wiki/wiki_test.go

+ 12
- 4
services/wiki/wiki_test.go View File

@@ -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)
@@ -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)
@@ -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 {
@@ -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")

Loading…
Cancel
Save