Prevent "Race" detected in TestAdmin*User (#16830)

zeripath · web-flow · commit cd8db3a83d3e · 2021-08-27T15:00:37.000+02:00
These tests are missing the defer prefix. Related #1441 Signed-off-by: Andrew Thornton <art27@cantab.net>
diff --git a/integrations/admin_user_test.go b/integrations/admin_user_test.go
@@ -15,7 +15,7 @@ import (
 )
 
 func TestAdminViewUsers(t *testing.T) {
-	prepareTestEnv(t)
+	defer prepareTestEnv(t)()
 
 	session := loginUser(t, "user1")
 	req := NewRequest(t, "GET", "/admin/users")
@@ -27,7 +27,7 @@ func TestAdminViewUsers(t *testing.T) {
 }
 
 func TestAdminViewUser(t *testing.T) {
-	prepareTestEnv(t)
+	defer prepareTestEnv(t)()
 
 	session := loginUser(t, "user1")
 	req := NewRequest(t, "GET", "/admin/users/1")
@@ -39,7 +39,7 @@ func TestAdminViewUser(t *testing.T) {
 }
 
 func TestAdminEditUser(t *testing.T) {
-	prepareTestEnv(t)
+	defer prepareTestEnv(t)()
 
 	testSuccessfullEdit(t, models.User{ID: 2, Name: "newusername", LoginName: "otherlogin", Email: "new@e-mail.gitea"})
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`func TestAdminViewUsers(t *testing.T) {`
`18`		`- prepareTestEnv(t)`
	`18`	`+ defer prepareTestEnv(t)()`
`19`	`19`
`20`	`20`	`session := loginUser(t, "user1")`
`21`	`21`	`req := NewRequest(t, "GET", "/admin/users")`
`@@ -27,7 +27,7 @@ func TestAdminViewUsers(t *testing.T) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`func TestAdminViewUser(t *testing.T) {`
`30`		`- prepareTestEnv(t)`
	`30`	`+ defer prepareTestEnv(t)()`
`31`	`31`
`32`	`32`	`session := loginUser(t, "user1")`
`33`	`33`	`req := NewRequest(t, "GET", "/admin/users/1")`
`@@ -39,7 +39,7 @@ func TestAdminViewUser(t *testing.T) {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`func TestAdminEditUser(t *testing.T) {`
`42`		`- prepareTestEnv(t)`
	`42`	`+ defer prepareTestEnv(t)()`
`43`	`43`
`44`	`44`	`testSuccessfullEdit(t, models.User{ID: 2, Name: "newusername", LoginName: "otherlogin", Email: "[email protected]"})`
`45`	`45`	`}`