Skip to content

Prevent "Race" detected in TestAdmin*User #16830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
6543 merged 3 commits into from
Aug 27, 2021
Merged

Prevent "Race" detected in TestAdmin*User #16830

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1f796f
Prevent "Race" detected in TestAdmin*User
zeripath Aug 26, 2021
a7d3ad7
Merge branch 'main' into prevent-log-race-detection
zeripath Aug 26, 2021
7d5568c
Merge branch 'main' into prevent-log-race-detection
6543 Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions integrations/admin_user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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"})
}
Expand Down