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 mah broken tests

Browse Source
This commit is contained in:
Jeff Mitchell
2016-06-10 14:03:56 -04:00
parent c6ded383cb
commit 117200c88a
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
http/sys_policy_test.go
View File

@@ -17,8 +17,8 @@ func TestSysPolicies(t *testing.T) {
var actual map[string]interface{} var actual map[string]interface{}
expected := map[string]interface{}{ expected := map[string]interface{}{
"policies": []interface{}{"response-wrapping", "default", "root"}, "policies": []interface{}{"default", "response-wrapping", "root"},
"keys": []interface{}{"response-wrapping", "default", "root"}, "keys": []interface{}{"default", "response-wrapping", "root"},
} }
testResponseStatus(t, resp, 200) testResponseStatus(t, resp, 200)
testResponseBody(t, resp, &actual) testResponseBody(t, resp, &actual)
@@ -62,8 +62,8 @@ func TestSysWritePolicy(t *testing.T) {
var actual map[string]interface{} var actual map[string]interface{}
expected := map[string]interface{}{ expected := map[string]interface{}{
"policies": []interface{}{"response-wrapping", "default", "foo", "root"}, "policies": []interface{}{"default", "foo", "response-wrapping", "root"},
"keys": []interface{}{"response-wrapping", "default", "foo", "root"}, "keys": []interface{}{"default", "foo", "response-wrapping", "root"},
} }
testResponseStatus(t, resp, 200) testResponseStatus(t, resp, 200)
testResponseBody(t, resp, &actual) testResponseBody(t, resp, &actual)
@@ -100,8 +100,8 @@ func TestSysDeletePolicy(t *testing.T) {
var actual map[string]interface{} var actual map[string]interface{}
expected := map[string]interface{}{ expected := map[string]interface{}{
"policies": []interface{}{"response-wrapping", "default", "root"}, "policies": []interface{}{"default", "response-wrapping", "root"},
"keys": []interface{}{"response-wrapping", "default", "root"}, "keys": []interface{}{"default", "response-wrapping", "root"},
} }
testResponseStatus(t, resp, 200) testResponseStatus(t, resp, 200)
testResponseBody(t, resp, &actual) testResponseBody(t, resp, &actual)

12
vault/logical_system_test.go
View File

@@ -610,8 +610,8 @@ func TestSystemBackend_policyList(t *testing.T) {
} }
exp := map[string]interface{}{ exp := map[string]interface{}{
"keys": []string{"response-wrapping", "default", "root"}, "keys": []string{"default", "response-wrapping", "root"},
"policies": []string{"response-wrapping", "default", "root"}, "policies": []string{"default", "response-wrapping", "root"},
} }
if !reflect.DeepEqual(resp.Data, exp) { if !reflect.DeepEqual(resp.Data, exp) {
t.Fatalf("got: %#v expect: %#v", resp.Data, exp) t.Fatalf("got: %#v expect: %#v", resp.Data, exp)
@@ -663,8 +663,8 @@ func TestSystemBackend_policyCRUD(t *testing.T) {
} }
exp = map[string]interface{}{ exp = map[string]interface{}{
"keys": []string{"response-wrapping", "default", "foo", "root"}, "keys": []string{"default", "foo", "response-wrapping", "root"},
"policies": []string{"response-wrapping", "default", "foo", "root"}, "policies": []string{"default", "foo", "response-wrapping", "root"},
} }
if !reflect.DeepEqual(resp.Data, exp) { if !reflect.DeepEqual(resp.Data, exp) {
t.Fatalf("got: %#v expect: %#v", resp.Data, exp) t.Fatalf("got: %#v expect: %#v", resp.Data, exp)
@@ -698,8 +698,8 @@ func TestSystemBackend_policyCRUD(t *testing.T) {
} }
exp = map[string]interface{}{ exp = map[string]interface{}{
"keys": []string{"response-wrapping", "default", "root"}, "keys": []string{"default", "response-wrapping", "root"},
"policies": []string{"response-wrapping", "default", "root"}, "policies": []string{"default", "response-wrapping", "root"},
} }
if !reflect.DeepEqual(resp.Data, exp) { if !reflect.DeepEqual(resp.Data, exp) {
t.Fatalf("got: %#v expect: %#v", resp.Data, exp) t.Fatalf("got: %#v expect: %#v", resp.Data, exp)

2
vault/policy_store_test.go
View File

@@ -138,7 +138,7 @@ func TestPolicyStore_Predefined(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
if len(out) != 2 || out[0] != "response-wrapping" || out[1] != "default" { if len(out) != 2 || out[0] != "default" || out[1] != "response-wrapping" {
t.Fatalf("bad: %v", out) t.Fatalf("bad: %v", out)
} }