From 1fc803ab2c807aa523cf09e00fc46c757798a9e7 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Thu, 25 May 2017 09:00:49 -0400 Subject: [PATCH] Fix tests --- command/generate-root_test.go | 2 +- command/rekey_test.go | 2 +- command/write_test.go | 4 ++-- vault/core.go | 5 ----- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/command/generate-root_test.go b/command/generate-root_test.go index 847400d848..31d956d73a 100644 --- a/command/generate-root_test.go +++ b/command/generate-root_test.go @@ -82,7 +82,7 @@ func TestGenerateRoot_status(t *testing.T) { t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String()) } - if !strings.Contains(string(ui.OutputWriter.Bytes()), "Started: true") { + if !strings.Contains(ui.OutputWriter.String(), "Started: true") { t.Fatalf("bad: %s", ui.OutputWriter.String()) } } diff --git a/command/rekey_test.go b/command/rekey_test.go index 21e4e24be4..7911111c4d 100644 --- a/command/rekey_test.go +++ b/command/rekey_test.go @@ -182,7 +182,7 @@ func TestRekey_status(t *testing.T) { t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String()) } - if !strings.Contains(string(ui.OutputWriter.Bytes()), "Started: true") { + if !strings.Contains(ui.OutputWriter.String(), "Started: true") { t.Fatalf("bad: %s", ui.OutputWriter.String()) } } diff --git a/command/write_test.go b/command/write_test.go index 786bbc3360..5aa3c1e559 100644 --- a/command/write_test.go +++ b/command/write_test.go @@ -243,8 +243,8 @@ func TestWrite_Output(t *testing.T) { if code := c.Run(args); code != 0 { t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String()) } - if !strings.Contains(string(ui.OutputWriter.Bytes()), "Key") { - t.Fatalf("bad: %s", string(ui.OutputWriter.Bytes())) + if !strings.Contains(ui.OutputWriter.String(), "Key") { + t.Fatalf("bad: %s", ui.OutputWriter.String()) } } diff --git a/vault/core.go b/vault/core.go index b178194f04..5029794acd 100644 --- a/vault/core.go +++ b/vault/core.go @@ -1418,11 +1418,6 @@ func (c *Core) runStandby(doneCh, stopCh, manualStepDownCh chan struct{}) { default: } - // Clear forwarding clients - c.requestForwardingConnectionLock.Lock() - c.clearForwardingClients() - c.requestForwardingConnectionLock.Unlock() - // Create a lock uuid, err := uuid.GenerateUUID() if err != nil {