Skip to content

Commit

Permalink
Indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
afflerbach committed Jul 30, 2021
1 parent e1a7f6c commit d220277
Showing 1 changed file with 55 additions and 55 deletions.
110 changes: 55 additions & 55 deletions server/http_oauth2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -481,75 +481,75 @@ func TestOAuth2_Locking(t *testing.T) {
}

t.Run("Lock is effective", func(t *testing.T) {
// Wait until token has expired.
time.Sleep(2 * time.Second)
// Wait until token has expired.
time.Sleep(2 * time.Second)

// Fetch new token.
go func() {
res, err := newClient().Do(req)
helper.Must(err)
// Fetch new token.
go func() {
res, err := newClient().Do(req)
helper.Must(err)

if token+"2" != res.Header.Get("Token") {
t.Errorf("Received wrong token: want %s2, got: %s", token, res.Header.Get("Token"))
}
}()
if token+"2" != res.Header.Get("Token") {
t.Errorf("Received wrong token: want %s2, got: %s", token, res.Header.Get("Token"))
}
}()

// Slow response due to lock
go func() {
start := time.Now()
res, err := newClient().Do(req)
helper.Must(err)
timeElapsed := time.Since(start).Seconds()
// Slow response due to lock
go func() {
start := time.Now()
res, err := newClient().Do(req)
helper.Must(err)
timeElapsed := time.Since(start).Seconds()

if token+"2" != res.Header.Get("Token") {
t.Errorf("Received wrong token: want %s2, got: %s", token, res.Header.Get("Token"))
}
if token+"2" != res.Header.Get("Token") {
t.Errorf("Received wrong token: want %s2, got: %s", token, res.Header.Get("Token"))
}

if timeElapsed < 1 {
t.Errorf("Response came too fast: dysfunctional lock?! (%v s)", timeElapsed)
}
}()
if timeElapsed < 1 {
t.Errorf("Response came too fast: dysfunctional lock?! (%v s)", timeElapsed)
}
}()
})

t.Run("Mem store expiry", func(t *testing.T) {
// Wait again until token has expired.
time.Sleep(2 * time.Second)
// Wait again until token has expired.
time.Sleep(2 * time.Second)

// Request fresh token and store in memstore
res, err := newClient().Do(req)
helper.Must(err)
if res.StatusCode != http.StatusNoContent {
t.Errorf("Unexpected response status: want %d, got: %d", http.StatusNoContent, res.StatusCode)
}
// Request fresh token and store in memstore
res, err := newClient().Do(req)
helper.Must(err)
if res.StatusCode != http.StatusNoContent {
t.Errorf("Unexpected response status: want %d, got: %d", http.StatusNoContent, res.StatusCode)
}

if token+"3" != res.Header.Get("Token") {
t.Errorf("Received wrong token: want %s3, got: %s", token, res.Header.Get("Token"))
}
if token+"3" != res.Header.Get("Token") {
t.Errorf("Received wrong token: want %s3, got: %s", token, res.Header.Get("Token"))
}

if oauthRequestCount != 3 {
t.Errorf("Unexpected number of OAuth2 requests: want 3, got: %d", oauthRequestCount)
}
if oauthRequestCount != 3 {
t.Errorf("Unexpected number of OAuth2 requests: want 3, got: %d", oauthRequestCount)
}

// Disconnect OAuth server
oauthOrigin.Close()
// Disconnect OAuth server
oauthOrigin.Close()

// Next request gets token from memstore
res, err = newClient().Do(req)
helper.Must(err)
if res.StatusCode != http.StatusNoContent {
t.Errorf("Unexpected response status: want %d, got: %d", http.StatusNoContent, res.StatusCode)
}
// Next request gets token from memstore
res, err = newClient().Do(req)
helper.Must(err)
if res.StatusCode != http.StatusNoContent {
t.Errorf("Unexpected response status: want %d, got: %d", http.StatusNoContent, res.StatusCode)
}

if token+"3" != res.Header.Get("Token") {
t.Errorf("Wrong token from mem store: want %s3, got: %s", token, res.Header.Get("Token"))
}
if token+"3" != res.Header.Get("Token") {
t.Errorf("Wrong token from mem store: want %s3, got: %s", token, res.Header.Get("Token"))
}

// Wait until token has expired. Next request accesses the OAuth server again.
time.Sleep(2 * time.Second)
res, err = newClient().Do(req)
helper.Must(err)
if res.StatusCode != http.StatusBadGateway {
t.Errorf("Unexpected response status: want %d, got: %d", http.StatusBadGateway, res.StatusCode)
}
// Wait until token has expired. Next request accesses the OAuth server again.
time.Sleep(2 * time.Second)
res, err = newClient().Do(req)
helper.Must(err)
if res.StatusCode != http.StatusBadGateway {
t.Errorf("Unexpected response status: want %d, got: %d", http.StatusBadGateway, res.StatusCode)
}
})
}

0 comments on commit d220277

Please sign in to comment.