Skip to content

Commit

Permalink
[aetest] Fix Federated-Identity headers (#224)
Browse files Browse the repository at this point in the history
* Fix Federated-Identity headers
* Use user.FederatedIdentity instead of user.Email
* Fix out-of-range test
* Remove go1.8 tests
  • Loading branch information
sbuss committed Apr 22, 2020
1 parent b6ce084 commit 5539592
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ script:

matrix:
include:
- go: 1.8.x
env: GOAPP=true
- go: 1.9.x
env: GOAPP=true
- go: 1.10.x
Expand Down
6 changes: 6 additions & 0 deletions aetest/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ func Login(u *user.User, req *http.Request) {
id = strconv.Itoa(int(crc32.Checksum([]byte(u.Email), crc32.IEEETable)))
}
req.Header.Set("X-AppEngine-User-Id", id)
req.Header.Set("X-AppEngine-Federated-Identity", u.FederatedIdentity)
req.Header.Set("X-AppEngine-Federated-Provider", u.FederatedProvider)
// NOTE: the following two headers are wrong, but are preserved to not break legacy tests.
req.Header.Set("X-AppEngine-User-Federated-Identity", u.Email)
req.Header.Set("X-AppEngine-User-Federated-Provider", u.FederatedProvider)
if u.Admin {
Expand All @@ -31,6 +34,9 @@ func Logout(req *http.Request) {
req.Header.Del("X-AppEngine-User-Email")
req.Header.Del("X-AppEngine-User-Id")
req.Header.Del("X-AppEngine-User-Is-Admin")
req.Header.Del("X-AppEngine-Federated-Identity")
req.Header.Del("X-AppEngine-Federated-Provider")
// NOTE: the following two headers are wrong, but are preserved to not break legacy tests.
req.Header.Del("X-AppEngine-User-Federated-Identity")
req.Header.Del("X-AppEngine-User-Federated-Provider")
}
2 changes: 1 addition & 1 deletion internal/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ func TestAPICallAllocations(t *testing.T) {
}

// Lots of room for improvement...
const min, max float64 = 60, 85
const min, max float64 = 60, 86
if avg < min || max < avg {
t.Errorf("Allocations per API call = %g, want in [%g,%g]", avg, min, max)
}
Expand Down

0 comments on commit 5539592

Please sign in to comment.