upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-28 04:10:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Place error check before the response check in expiration test

Browse source
This commit is contained in:
vishalnayak 2016-07-08 19:01:36 -04:00
parent 3345322132
commit d5b73fa0f5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
vault/expiration_test.go
View file

@ -160,7 +160,7 @@ func TestExpiration_RegisterAuth_NoLease(t *testing.T) {
// Should not be able to renew, no expiration
resp, err := exp.RenewToken(&logical.Request{}, "auth/github/login", root.ID, 0)
if err != nil && (err != logical.ErrInvalidRequest || (resp != nil && resp.IsError() && resp.Error().Error() != "lease not found or lease is not renewable")) {
t.Fatalf("err: %v", err)
t.Fatalf("bad: err:%v resp:%#v", err, resp)
}
if resp == nil {
t.Fatal("expected a response")
@ -459,12 +459,13 @@ func TestExpiration_RenewToken_NotRenewable(t *testing.T) {
// Attempt to renew the token
resp, err := exp.RenewToken(&logical.Request{}, "auth/github/login", root.ID, 0)
if err != nil && (err != logical.ErrInvalidRequest || (resp != nil && resp.IsError() && resp.Error().Error() != "lease not found or lease is not renewable")) {
t.Fatalf("bad: err:%v resp:%#v", err, resp)
}
if resp == nil {
t.Fatal("expected a response")
}
if err != logical.ErrInvalidRequest || resp.Error().Error() != "lease is not renewable" {
t.Fatalf("err: %v", err)
}
}
func TestExpiration_Renew(t *testing.T) {