scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 19:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Jeff Mitchell
2017-05-25 09:00:49 -04:00
parent 116445ceb3
commit 1fc803ab2c
4 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
command/generate-root_test.go
View File

@@ -82,7 +82,7 @@ func TestGenerateRoot_status(t *testing.T) {
t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String()) 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()) t.Fatalf("bad: %s", ui.OutputWriter.String())
} }
} }

2
command/rekey_test.go
View File

@@ -182,7 +182,7 @@ func TestRekey_status(t *testing.T) {
t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String()) 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()) t.Fatalf("bad: %s", ui.OutputWriter.String())
} }
} }

4
command/write_test.go
View File

@@ -243,8 +243,8 @@ func TestWrite_Output(t *testing.T) {
if code := c.Run(args); code != 0 { if code := c.Run(args); code != 0 {
t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String()) t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
} }
if !strings.Contains(string(ui.OutputWriter.Bytes()), "Key") { if !strings.Contains(ui.OutputWriter.String(), "Key") {
t.Fatalf("bad: %s", string(ui.OutputWriter.Bytes())) t.Fatalf("bad: %s", ui.OutputWriter.String())
} }
} }

5
vault/core.go
View File

@@ -1418,11 +1418,6 @@ func (c *Core) runStandby(doneCh, stopCh, manualStepDownCh chan struct{}) {
default: default:
} }
// Clear forwarding clients
c.requestForwardingConnectionLock.Lock()
c.clearForwardingClients()
c.requestForwardingConnectionLock.Unlock()
// Create a lock // Create a lock
uuid, err := uuid.GenerateUUID() uuid, err := uuid.GenerateUUID()
if err != nil { if err != nil {