scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-31 10:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

http: fix tests

Browse Source
This commit is contained in:
Mitchell Hashimoto
2015-04-04 17:42:19 -07:00
parent 7ac32b5da5
commit a9bd83b4ef
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/secret.go
View File

@@ -8,7 +8,7 @@ import (
// Secret is the structure returned for every secret within Vault. // Secret is the structure returned for every secret within Vault.
type Secret struct { type Secret struct {
VaultId string `json:"vault_id"` VaultId string `json:"vault_id"`
Renewable bool `json":renewable"` Renewable bool `json:"renewable"`
LeaseDuration int `json:"lease_duration"` LeaseDuration int `json:"lease_duration"`
Data map[string]interface{} `json:"data"` Data map[string]interface{} `json:"data"`
Auth *SecretAuth `json:"auth,omitempty"` Auth *SecretAuth `json:"auth,omitempty"`

6
http/logical_test.go
View File

@@ -4,6 +4,7 @@ import (
"net/http" "net/http"
"reflect" "reflect"
"testing" "testing"
"time"
"github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/vault"
) )
@@ -27,16 +28,17 @@ func TestLogical(t *testing.T) {
var actual map[string]interface{} var actual map[string]interface{}
expected := map[string]interface{}{ expected := map[string]interface{}{
"renewable": false, "renewable": false,
"lease_duration": float64(0), "lease_duration": float64((30 * 24 * time.Hour) / time.Second),
"data": map[string]interface{}{ "data": map[string]interface{}{
"data": "bar", "data": "bar",
}, },
"auth": nil,
} }
testResponseStatus(t, resp, 200) testResponseStatus(t, resp, 200)
testResponseBody(t, resp, &actual) testResponseBody(t, resp, &actual)
delete(actual, "vault_id") delete(actual, "vault_id")
if !reflect.DeepEqual(actual, expected) { if !reflect.DeepEqual(actual, expected) {
t.Fatalf("bad: %#v", actual) t.Fatalf("bad: %#v %#v", actual, expected)
} }
} }

2
http/sys_audit_test.go
View File

@@ -26,7 +26,7 @@ func TestSysAudit(t *testing.T) {
var actual map[string]interface{} var actual map[string]interface{}
expected := map[string]interface{}{ expected := map[string]interface{}{
"noop": map[string]interface{}{ "noop/": map[string]interface{}{
"type": "noop", "type": "noop",
"description": "", "description": "",
"options": map[string]interface{}{}, "options": map[string]interface{}{},

8
http/sys_auth_test.go
View File

@@ -21,7 +21,7 @@ func TestSysAuth(t *testing.T) {
var actual map[string]interface{} var actual map[string]interface{}
expected := map[string]interface{}{ expected := map[string]interface{}{
"token": map[string]interface{}{ "token/": map[string]interface{}{
"description": "token based credentials", "description": "token based credentials",
"type": "token", "type": "token",
}, },
@@ -52,11 +52,11 @@ func TestSysEnableAuth(t *testing.T) {
var actual map[string]interface{} var actual map[string]interface{}
expected := map[string]interface{}{ expected := map[string]interface{}{
"foo": map[string]interface{}{ "foo/": map[string]interface{}{
"description": "foo", "description": "foo",
"type": "noop", "type": "noop",
}, },
"token": map[string]interface{}{ "token/": map[string]interface{}{
"description": "token based credentials", "description": "token based credentials",
"type": "token", "type": "token",
}, },
@@ -90,7 +90,7 @@ func TestSysDisableAuth(t *testing.T) {
var actual map[string]interface{} var actual map[string]interface{}
expected := map[string]interface{}{ expected := map[string]interface{}{
"token": map[string]interface{}{ "token/": map[string]interface{}{
"description": "token based credentials", "description": "token based credentials",
"type": "token", "type": "token",
}, },