Skip to content

Commit

Permalink
Remove test session cache to reduce possible concurrent problem (#22199
Browse files Browse the repository at this point in the history
…) (#22429)

backport #22199
  • Loading branch information
lunny authored Jan 13, 2023
1 parent 421d879 commit 37e23c9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
10 changes: 2 additions & 8 deletions tests/integration/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,6 @@ func (s *TestSession) MakeRequestNilResponseHashSumRecorder(t testing.TB, req *h

const userPassword = "password"

var loginSessionCache = make(map[string]*TestSession, 10)

func emptyTestSession(t testing.TB) *TestSession {
t.Helper()
jar, err := cookiejar.New(nil)
Expand All @@ -225,12 +223,8 @@ func getUserToken(t testing.TB, userName string) string {

func loginUser(t testing.TB, userName string) *TestSession {
t.Helper()
if session, ok := loginSessionCache[userName]; ok {
return session
}
session := loginUserWithPassword(t, userName, userPassword)
loginSessionCache[userName] = session
return session

return loginUserWithPassword(t, userName, userPassword)
}

func loginUserWithPassword(t testing.TB, userName, password string) *TestSession {
Expand Down
3 changes: 0 additions & 3 deletions tests/integration/signout_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,4 @@ func TestSignOut(t *testing.T) {
// try to view a private repo, should fail
req = NewRequest(t, "GET", "/user2/repo2")
session.MakeRequest(t, req, http.StatusNotFound)

// invalidate cached cookies for user2, for subsequent tests
delete(loginSessionCache, "user2")
}

0 comments on commit 37e23c9

Please sign in to comment.