mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-05 12:26:34 +02:00
Code Issues Projects Releases Wiki Activity

Fix rekey tests

Browse Source
This commit is contained in:
Jeff Mitchell 2018-05-29 18:02:13 -04:00
parent cc08d0af54
commit 6185488f09
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
vault/rekey_test.go
View File

@ -41,12 +41,8 @@ func testCore_Rekey_Lifecycle_Common(t *testing.T, c *Core, masterKeys [][]byte,
}
// Should be no progress
num, err := c.RekeyProgress(recovery)
if err != nil {
t.Fatalf("err: %v", err)
}
if num != 0 {
t.Fatalf("bad: %d", num)
if _, _, err := c.RekeyProgress(recovery, false); err == nil {
t.Fatal("expected error from RekeyProgress")
}
// Should be no config
@ -186,12 +182,8 @@ func testCore_Rekey_Update_Common(t *testing.T, c *Core, keys [][]byte, root str
}
// Should be no progress
num, hErr := c.RekeyProgress(recovery)
if hErr != nil {
t.Fatalf("err: %v", hErr)
}
if num != 0 {
t.Fatalf("rekey progress error: %d", num)
if _, _, err := c.RekeyProgress(recovery, false); err == nil {
t.Fatal("expected error from RekeyProgress")
}
// Should be no config
@ -275,12 +267,14 @@ func testCore_Rekey_Update_Common(t *testing.T, c *Core, keys [][]byte, root str
}
// Should be progress
num, err := c.RekeyProgress(recovery)
if err != nil {
t.Fatalf("err: %v", err)
}
if (i == 2 && num != 0) || (i != 2 && num != i+1) {
t.Fatalf("bad: %d", num)
if i < 2 {
_, num, err := c.RekeyProgress(recovery, false)
if err != nil {
t.Fatalf("err: %v", err)
}
if num != i+1 {
t.Fatalf("bad: %d", num)
}
}
}
if result == nil || len(result.SecretShares) != 1 {