diff --git a/command/agent/keyring_test.go b/command/agent/keyring_test.go index fc22bc8a0..3408d8df0 100644 --- a/command/agent/keyring_test.go +++ b/command/agent/keyring_test.go @@ -6,6 +6,8 @@ import ( "os" "path/filepath" "testing" + + "github.com/hashicorp/go-hclog" ) func TestAgent_LoadKeyrings(t *testing.T) { @@ -56,8 +58,10 @@ func TestAgent_InitKeyring(t *testing.T) { file := filepath.Join(dir, "keyring") + logger := hclog.NewNullLogger() + // First initialize the keyring - if err := initKeyring(file, key1); err != nil { + if err := initKeyring(file, key1, logger); err != nil { t.Fatalf("err: %s", err) } @@ -70,7 +74,7 @@ func TestAgent_InitKeyring(t *testing.T) { } // Try initializing again with a different key - if err := initKeyring(file, key2); err != nil { + if err := initKeyring(file, key2, logger); err != nil { t.Fatalf("err: %s", err) } diff --git a/command/agent/testagent.go b/command/agent/testagent.go index 1fa14879a..8ae07c3c9 100644 --- a/command/agent/testagent.go +++ b/command/agent/testagent.go @@ -147,7 +147,7 @@ RETRY: if a.Key != "" { writeKey := func(key, filename string) { path := filepath.Join(a.Config.DataDir, filename) - if err := initKeyring(path, key); err != nil { + if err := initKeyring(path, key, a.logger); err != nil { a.T.Fatalf("Error creating keyring %s: %s", path, err) } }