From c0014c9640fb4b13abdce9818bfa923d9e94e34c Mon Sep 17 00:00:00 2001 From: Victor Rodriguez Date: Tue, 21 Nov 2023 08:56:58 -0500 Subject: [PATCH] Augment testCore_Rekey_Update_Common to test for RekeyUpdate errors. (#24206) --- vault/rekey_test.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/vault/rekey_test.go b/vault/rekey_test.go index c0857a6f94..a7278b037f 100644 --- a/vault/rekey_test.go +++ b/vault/rekey_test.go @@ -151,6 +151,10 @@ func TestCore_Rekey_Update(t *testing.T) { } func testCore_Rekey_Update_Common(t *testing.T, c *Core, keys [][]byte, root string, recovery bool) { + testCore_Rekey_Update_Common_Error(t, c, keys, root, recovery, false) +} + +func testCore_Rekey_Update_Common_Error(t *testing.T, c *Core, keys [][]byte, root string, recovery bool, wantRekeyUpdateError bool) { var err error // Start a rekey var expType string @@ -184,12 +188,19 @@ func testCore_Rekey_Update_Common(t *testing.T, c *Core, keys [][]byte, root str for _, key := range keys { result, err = c.RekeyUpdate(context.Background(), key, rkconf.Nonce, recovery) if err != nil { - t.Fatalf("err: %v", err) + if !wantRekeyUpdateError { + t.Fatalf("err: %v", err) + } else { + return + } } if result != nil { break } } + if wantRekeyUpdateError { + t.Fatal("expected and error during RekeyUpdate") + } if result == nil { t.Fatal("nil result after update") }