luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Fix some panics resulting from calling ExpirationManager.Stop directly. (#11547)

This commit is contained in:
Nick Cabatoff 2021-05-06 12:39:01 -04:00 committed by GitHub
parent 57b6e786fc
commit 0926e302c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vault/expiration_test.go
View File

@ -2531,7 +2531,8 @@ func registerOneLease(t *testing.T, ctx context.Context, exp *ExpirationManager)
} }
func TestExpiration_MarkIrrevocable(t *testing.T) { func TestExpiration_MarkIrrevocable(t *testing.T) {
exp := mockExpiration(t) c, _, _ := TestCoreUnsealed(t)
exp := c.expiration
ctx := namespace.RootContext(nil) ctx := namespace.RootContext(nil)
leaseID := registerOneLease(t, ctx, exp) leaseID := registerOneLease(t, ctx, exp)
@ -2570,7 +2571,7 @@ func TestExpiration_MarkIrrevocable(t *testing.T) {
} }
// stop and restore to verify that irrevocable leases are properly loaded from storage // stop and restore to verify that irrevocable leases are properly loaded from storage
err = exp.Stop() err = c.stopExpiration()
if err != nil { if err != nil {
t.Fatalf("error stopping expiration manager: %v", err) t.Fatalf("error stopping expiration manager: %v", err)
} }
@ -2646,7 +2647,8 @@ func TestExpiration_FetchLeaseTimesIrrevocable(t *testing.T) {
} }
func TestExpiration_StopClearsIrrevocableCache(t *testing.T) { func TestExpiration_StopClearsIrrevocableCache(t *testing.T) {
exp := mockExpiration(t) c, _, _ := TestCoreUnsealed(t)
exp := c.expiration
ctx := namespace.RootContext(nil) ctx := namespace.RootContext(nil)
leaseID := registerOneLease(t, ctx, exp) leaseID := registerOneLease(t, ctx, exp)
@ -2656,7 +2658,7 @@ func TestExpiration_StopClearsIrrevocableCache(t *testing.T) {
} }
exp.markLeaseIrrevocable(ctx, le, fmt.Errorf("test irrevocable error")) exp.markLeaseIrrevocable(ctx, le, fmt.Errorf("test irrevocable error"))
err = exp.Stop() err = c.stopExpiration()
if err != nil { if err != nil {
t.Fatalf("error stopping expiration manager: %v", err) t.Fatalf("error stopping expiration manager: %v", err)
} }