fix all tests

This commit is contained in:
Mitchell Hashimoto
2015-03-15 17:10:33 -07:00
parent e7f7f7a221
commit 2d92c2ee10
3 changed files with 9 additions and 11 deletions

View File

@@ -17,7 +17,7 @@ func TestSealStatus(t *testing.T) {
}
core := vault.TestCore(t)
keys := vault.TestCoreInit(t, core)
key := vault.TestCoreInit(t, core)
ln, addr := http.TestServer(t, core)
defer ln.Close()
@@ -26,10 +26,8 @@ func TestSealStatus(t *testing.T) {
t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
}
for _, k := range keys {
if _, err := core.Unseal(k); err != nil {
t.Fatalf("err: %s", err)
}
if _, err := core.Unseal(key); err != nil {
t.Fatalf("err: %s", err)
}
if code := c.Run(args); code != 0 {

View File

@@ -11,13 +11,13 @@ import (
func TestUnseal(t *testing.T) {
core := vault.TestCore(t)
keys := vault.TestCoreInit(t, core)
key := vault.TestCoreInit(t, core)
ln, addr := http.TestServer(t, core)
defer ln.Close()
ui := new(cli.MockUi)
c := &UnsealCommand{
Key: hex.EncodeToString(keys[0]),
Key: hex.EncodeToString(key),
Meta: Meta{
Ui: ui,
},

View File

@@ -57,8 +57,8 @@ func TestSysSeal_unsealed(t *testing.T) {
ln, addr := TestServer(t, core)
defer ln.Close()
keys := vault.TestCoreInit(t, core)
if _, err := core.Unseal(keys[0]); err != nil {
key := vault.TestCoreInit(t, core)
if _, err := core.Unseal(key); err != nil {
t.Fatalf("err: %s", err)
}
@@ -76,12 +76,12 @@ func TestSysSeal_unsealed(t *testing.T) {
func TestSysUnseal(t *testing.T) {
core := vault.TestCore(t)
keys := vault.TestCoreInit(t, core)
key := vault.TestCoreInit(t, core)
ln, addr := TestServer(t, core)
defer ln.Close()
resp := testHttpPut(t, addr+"/v1/sys/unseal", map[string]interface{}{
"key": hex.EncodeToString(keys[0]),
"key": hex.EncodeToString(key),
})
var actual map[string]interface{}