scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-03 03:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some more too-tight timing in the token store tests

Browse Source
This commit is contained in:
Jeff Mitchell
2016-07-01 11:59:39 -04:00
parent b0844f9aea
commit 6dd329a495
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vault/token_store_test.go
View File

@@ -1533,8 +1533,8 @@ func TestTokenStore_RolePathSuffix(t *testing.T) {
func TestTokenStore_RolePeriod(t *testing.T) { func TestTokenStore_RolePeriod(t *testing.T) {
core, _, _, root := TestCoreWithTokenStore(t) core, _, _, root := TestCoreWithTokenStore(t)
core.defaultLeaseTTL = 5 * time.Second core.defaultLeaseTTL = 10 * time.Second
core.maxLeaseTTL = 5 * time.Second core.maxLeaseTTL = 10 * time.Second
// Note: these requests are sent to Core since Core handles registration // Note: these requests are sent to Core since Core handles registration
// with the expiration manager and we need the storage to be consistent // with the expiration manager and we need the storage to be consistent
@@ -1554,7 +1554,7 @@ func TestTokenStore_RolePeriod(t *testing.T) {
} }
// This first set of logic is to verify that a normal non-root token will // This first set of logic is to verify that a normal non-root token will
// be given a TTL of 5 seconds, and that renewing will not cause the TTL to // be given a TTL of 10 seconds, and that renewing will not cause the TTL to
// increase since that's the configured backend max. Then we verify that // increase since that's the configured backend max. Then we verify that
// increment works. // increment works.
{ {
@@ -1578,11 +1578,11 @@ func TestTokenStore_RolePeriod(t *testing.T) {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
ttl := resp.Data["ttl"].(int64) ttl := resp.Data["ttl"].(int64)
if ttl > 5 { if ttl > 10 {
t.Fatalf("TTL too large") t.Fatalf("TTL too large")
} }
// Let the TTL go down a bit to 3 seconds // Let the TTL go down a bit to 8 seconds
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
req.Operation = logical.UpdateOperation req.Operation = logical.UpdateOperation
@@ -1599,10 +1599,12 @@ func TestTokenStore_RolePeriod(t *testing.T) {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
ttl = resp.Data["ttl"].(int64) ttl = resp.Data["ttl"].(int64)
if ttl > 3 { if ttl > 8 {
t.Fatalf("TTL too large") t.Fatalf("TTL too large")
} }
// Renewing should not have the increment increase since we've hit the
// max
req.Operation = logical.UpdateOperation req.Operation = logical.UpdateOperation
req.Path = "auth/token/renew-self" req.Path = "auth/token/renew-self"
req.Data = map[string]interface{}{ req.Data = map[string]interface{}{
@@ -1620,7 +1622,7 @@ func TestTokenStore_RolePeriod(t *testing.T) {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
ttl = resp.Data["ttl"].(int64) ttl = resp.Data["ttl"].(int64)
if ttl > 1 { if ttl > 8 {
t.Fatalf("TTL too large") t.Fatalf("TTL too large")
} }
} }