mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-12-08 19:11:49 +01:00
Code Issues Projects Releases Wiki Activity

Added cluster_name for existing config tests

Browse Source
This commit is contained in:
vishalnayak 2016-07-26 11:38:24 -04:00
parent 46b94d8612
commit f76c926b0a
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
command/server/config_test.go
View File

@ -61,6 +61,7 @@ func TestLoadConfigFile(t *testing.T) {
MaxLeaseTTLRaw: "10h", MaxLeaseTTLRaw: "10h",
DefaultLeaseTTL: 10 * time.Hour, DefaultLeaseTTL: 10 * time.Hour,
DefaultLeaseTTLRaw: "10h", DefaultLeaseTTLRaw: "10h",
ClusterName: "testcluster",
} }
if !reflect.DeepEqual(config, expected) { if !reflect.DeepEqual(config, expected) {
t.Fatalf("expected \n\n%#v\n\n to be \n\n%#v\n\n", config, expected) t.Fatalf("expected \n\n%#v\n\n to be \n\n%#v\n\n", config, expected)
@ -120,6 +121,7 @@ func TestLoadConfigFile_json(t *testing.T) {
MaxLeaseTTLRaw: "10h", MaxLeaseTTLRaw: "10h",
DefaultLeaseTTL: 10 * time.Hour, DefaultLeaseTTL: 10 * time.Hour,
DefaultLeaseTTLRaw: "10h", DefaultLeaseTTLRaw: "10h",
ClusterName: "testcluster",
} }
if !reflect.DeepEqual(config, expected) { if !reflect.DeepEqual(config, expected) {
t.Fatalf("expected \n\n%#v\n\n to be \n\n%#v\n\n", config, expected) t.Fatalf("expected \n\n%#v\n\n to be \n\n%#v\n\n", config, expected)
@ -218,6 +220,7 @@ func TestLoadConfigDir(t *testing.T) {
MaxLeaseTTL: 10 * time.Hour, MaxLeaseTTL: 10 * time.Hour,
DefaultLeaseTTL: 10 * time.Hour, DefaultLeaseTTL: 10 * time.Hour,
ClusterName: "testcluster",
} }
if !reflect.DeepEqual(config, expected) { if !reflect.DeepEqual(config, expected) {
t.Fatalf("bad: %#v", config) t.Fatalf("bad: %#v", config)

1
command/server/test-fixtures/config-dir/baz.hcl
View File

@ -5,3 +5,4 @@ telemetry {
} }
default_lease_ttl = "10h" default_lease_ttl = "10h"
cluster_name = "testcluster"

1
command/server/test-fixtures/config.hcl
View File

@ -26,3 +26,4 @@ ha_backend "consul" {
max_lease_ttl = "10h" max_lease_ttl = "10h"
default_lease_ttl = "10h" default_lease_ttl = "10h"
cluster_name = "testcluster"

3
command/server/test-fixtures/config.hcl.json
View File

@ -20,5 +20,6 @@
"statsite_address": "baz" "statsite_address": "baz"
}, },
"max_lease_ttl": "10h", "max_lease_ttl": "10h",
"default_lease_ttl": "10h" "default_lease_ttl": "10h",
"cluster_name":"testcluster"
} }