Remove test session cache to reduce possible concurrent problem (#22199) (#22429)

backport #22199
tokarchuk/v1.18
Lunny Xiao 2 years ago committed by GitHub
parent 421d87933b
commit 37e23c982f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      tests/integration/integration_test.go
  2. 3
      tests/integration/signout_test.go

@ -209,8 +209,6 @@ func (s *TestSession) MakeRequestNilResponseHashSumRecorder(t testing.TB, req *h
const userPassword = "password" const userPassword = "password"
var loginSessionCache = make(map[string]*TestSession, 10)
func emptyTestSession(t testing.TB) *TestSession { func emptyTestSession(t testing.TB) *TestSession {
t.Helper() t.Helper()
jar, err := cookiejar.New(nil) jar, err := cookiejar.New(nil)
@ -225,12 +223,8 @@ func getUserToken(t testing.TB, userName string) string {
func loginUser(t testing.TB, userName string) *TestSession { func loginUser(t testing.TB, userName string) *TestSession {
t.Helper() t.Helper()
if session, ok := loginSessionCache[userName]; ok {
return session return loginUserWithPassword(t, userName, userPassword)
}
session := loginUserWithPassword(t, userName, userPassword)
loginSessionCache[userName] = session
return session
} }
func loginUserWithPassword(t testing.TB, userName, password string) *TestSession { func loginUserWithPassword(t testing.TB, userName, password string) *TestSession {

@ -22,7 +22,4 @@ func TestSignOut(t *testing.T) {
// try to view a private repo, should fail // try to view a private repo, should fail
req = NewRequest(t, "GET", "/user2/repo2") req = NewRequest(t, "GET", "/user2/repo2")
session.MakeRequest(t, req, http.StatusNotFound) session.MakeRequest(t, req, http.StatusNotFound)
// invalidate cached cookies for user2, for subsequent tests
delete(loginSessionCache, "user2")
} }

Loading…
Cancel
Save