Skip to content

Commit 5539592

Browse files
authored
[aetest] Fix Federated-Identity headers (#224)
* Fix Federated-Identity headers * Use user.FederatedIdentity instead of user.Email * Fix out-of-range test * Remove go1.8 tests
1 parent b6ce084 commit 5539592

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ script:
1010

1111
matrix:
1212
include:
13-
- go: 1.8.x
14-
env: GOAPP=true
1513
- go: 1.9.x
1614
env: GOAPP=true
1715
- go: 1.10.x

aetest/user.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ func Login(u *user.User, req *http.Request) {
1616
id = strconv.Itoa(int(crc32.Checksum([]byte(u.Email), crc32.IEEETable)))
1717
}
1818
req.Header.Set("X-AppEngine-User-Id", id)
19+
req.Header.Set("X-AppEngine-Federated-Identity", u.FederatedIdentity)
20+
req.Header.Set("X-AppEngine-Federated-Provider", u.FederatedProvider)
21+
// NOTE: the following two headers are wrong, but are preserved to not break legacy tests.
1922
req.Header.Set("X-AppEngine-User-Federated-Identity", u.Email)
2023
req.Header.Set("X-AppEngine-User-Federated-Provider", u.FederatedProvider)
2124
if u.Admin {
@@ -31,6 +34,9 @@ func Logout(req *http.Request) {
3134
req.Header.Del("X-AppEngine-User-Email")
3235
req.Header.Del("X-AppEngine-User-Id")
3336
req.Header.Del("X-AppEngine-User-Is-Admin")
37+
req.Header.Del("X-AppEngine-Federated-Identity")
38+
req.Header.Del("X-AppEngine-Federated-Provider")
39+
// NOTE: the following two headers are wrong, but are preserved to not break legacy tests.
3440
req.Header.Del("X-AppEngine-User-Federated-Identity")
3541
req.Header.Del("X-AppEngine-User-Federated-Provider")
3642
}

internal/api_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ func TestAPICallAllocations(t *testing.T) {
415415
}
416416

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

0 commit comments

Comments
 (0)