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

fixing command server tests (#6242)

Browse Source
This commit is contained in:
Chris Hoffman
2019-02-15 12:06:20 -05:00
committed by Brian Kassouf
parent 6e96688719
commit ec015ec6bb
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
command/server/config_test.go
View File

@@ -53,6 +53,7 @@ func TestLoadConfigFile(t *testing.T) {
DisableHostname: false, DisableHostname: false,
DogStatsDAddr: "127.0.0.1:7254", DogStatsDAddr: "127.0.0.1:7254",
DogStatsDTags: []string{"tag_1:val_1", "tag_2:val_2"}, DogStatsDTags: []string{"tag_1:val_1", "tag_2:val_2"},
PrometheusRetentionTime: prometheusDefaultRetentionTime,
}, },
DisableCache: true, DisableCache: true,
@@ -126,6 +127,8 @@ func TestLoadConfigFile_topLevel(t *testing.T) {
DisableHostname: false, DisableHostname: false,
DogStatsDAddr: "127.0.0.1:7254", DogStatsDAddr: "127.0.0.1:7254",
DogStatsDTags: []string{"tag_1:val_1", "tag_2:val_2"}, DogStatsDTags: []string{"tag_1:val_1", "tag_2:val_2"},
PrometheusRetentionTime: 30 * time.Second,
PrometheusRetentionTimeRaw: "30s",
}, },
DisableCache: true, DisableCache: true,
@@ -202,6 +205,7 @@ func TestLoadConfigFile_json(t *testing.T) {
CirconusCheckTags: "", CirconusCheckTags: "",
CirconusBrokerID: "", CirconusBrokerID: "",
CirconusBrokerSelectTag: "", CirconusBrokerSelectTag: "",
PrometheusRetentionTime: prometheusDefaultRetentionTime,
}, },
MaxLeaseTTL: 10 * time.Hour, MaxLeaseTTL: 10 * time.Hour,
@@ -288,6 +292,8 @@ func TestLoadConfigFile_json2(t *testing.T) {
CirconusCheckTags: "cat1:tag1,cat2:tag2", CirconusCheckTags: "cat1:tag1,cat2:tag2",
CirconusBrokerID: "0", CirconusBrokerID: "0",
CirconusBrokerSelectTag: "dc:sfo", CirconusBrokerSelectTag: "dc:sfo",
PrometheusRetentionTime: 30 * time.Second,
PrometheusRetentionTimeRaw: "30s",
}, },
} }
if !reflect.DeepEqual(config, expected) { if !reflect.DeepEqual(config, expected) {
@@ -339,6 +345,7 @@ func TestLoadConfigDir(t *testing.T) {
StatsiteAddr: "qux", StatsiteAddr: "qux",
StatsdAddr: "baz", StatsdAddr: "baz",
DisableHostname: true, DisableHostname: true,
PrometheusRetentionTime: prometheusDefaultRetentionTime,
}, },
MaxLeaseTTL: 10 * time.Hour, MaxLeaseTTL: 10 * time.Hour,

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

@@ -26,6 +26,7 @@ telemetry {
statsite_address = "foo" statsite_address = "foo"
dogstatsd_addr = "127.0.0.1:7254" dogstatsd_addr = "127.0.0.1:7254"
dogstatsd_tags = ["tag_1:val_1", "tag_2:val_2"] dogstatsd_tags = ["tag_1:val_1", "tag_2:val_2"]
prometheus_retention_time = "30s"
} }
max_lease_ttl = "10h" max_lease_ttl = "10h"

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

@@ -42,6 +42,7 @@
"circonus_check_display_name": "node1:vault", "circonus_check_display_name": "node1:vault",
"circonus_check_tags": "cat1:tag1,cat2:tag2", "circonus_check_tags": "cat1:tag1,cat2:tag2",
"circonus_broker_id": "0", "circonus_broker_id": "0",
"circonus_broker_select_tag": "dc:sfo" "circonus_broker_select_tag": "dc:sfo",
"prometheus_retention_time": "30s"
} }
} }