Skip to content

Commit 2814f2f

Browse files
authored
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.
1 parent 1b1c55f commit 2814f2f

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

services/wiki/wiki_test.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,9 @@ func TestRepository_AddWikiPage(t *testing.T) {
168168
assert.NoError(t, AddWikiPage(git.DefaultContext, doer, repo, webPath, wikiContent, commitMsg))
169169
// Now need to show that the page has been added:
170170
gitRepo, err := git.OpenRepository(git.DefaultContext, repo.WikiPath())
171-
assert.NoError(t, err)
171+
if !assert.NoError(t, err) {
172+
return
173+
}
172174
defer gitRepo.Close()
173175
masterTree, err := gitRepo.GetTree(DefaultBranch)
174176
assert.NoError(t, err)
@@ -238,7 +240,9 @@ func TestRepository_DeleteWikiPage(t *testing.T) {
238240

239241
// Now need to show that the page has been added:
240242
gitRepo, err := git.OpenRepository(git.DefaultContext, repo.WikiPath())
241-
assert.NoError(t, err)
243+
if !assert.NoError(t, err) {
244+
return
245+
}
242246
defer gitRepo.Close()
243247
masterTree, err := gitRepo.GetTree(DefaultBranch)
244248
assert.NoError(t, err)
@@ -251,7 +255,9 @@ func TestPrepareWikiFileName(t *testing.T) {
251255
unittest.PrepareTestEnv(t)
252256
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
253257
gitRepo, err := git.OpenRepository(git.DefaultContext, repo.WikiPath())
254-
assert.NoError(t, err)
258+
if !assert.NoError(t, err) {
259+
return
260+
}
255261
defer gitRepo.Close()
256262

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

305311
gitRepo, err := git.OpenRepository(git.DefaultContext, tmpDir)
306-
assert.NoError(t, err)
312+
if !assert.NoError(t, err) {
313+
return
314+
}
307315
defer gitRepo.Close()
308316

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

0 commit comments

Comments
 (0)