Fix tests

This commit is contained in:
Michael Schurter 2017-01-20 17:04:52 -08:00
parent 054ee8df59
commit 3c7e50bc1b
3 changed files with 17 additions and 17 deletions

View File

@ -115,15 +115,15 @@ func TestConfig_Parse(t *testing.T) {
Addr: "127.0.0.1:9500",
Token: "token1",
Auth: "username:pass",
EnableSSL: true,
VerifySSL: true,
EnableSSL: &trueValue,
VerifySSL: &trueValue,
CAFile: "/path/to/ca/file",
CertFile: "/path/to/cert/file",
KeyFile: "/path/to/key/file",
ServerAutoJoin: true,
ClientAutoJoin: true,
AutoAdvertise: true,
ChecksUseAdvertise: true,
ServerAutoJoin: &trueValue,
ClientAutoJoin: &trueValue,
AutoAdvertise: &trueValue,
ChecksUseAdvertise: &trueValue,
},
Vault: &config.VaultConfig{
Addr: "127.0.0.1:9500",

View File

@ -120,18 +120,18 @@ func TestConfig_Merge(t *testing.T) {
Consul: &config.ConsulConfig{
ServerServiceName: "1",
ClientServiceName: "1",
AutoAdvertise: false,
AutoAdvertise: &falseValue,
Addr: "1",
Timeout: 1 * time.Second,
Token: "1",
Auth: "1",
EnableSSL: false,
VerifySSL: false,
EnableSSL: &falseValue,
VerifySSL: &falseValue,
CAFile: "1",
CertFile: "1",
KeyFile: "1",
ServerAutoJoin: false,
ClientAutoJoin: false,
ServerAutoJoin: &falseValue,
ClientAutoJoin: &falseValue,
},
}
@ -251,18 +251,18 @@ func TestConfig_Merge(t *testing.T) {
Consul: &config.ConsulConfig{
ServerServiceName: "2",
ClientServiceName: "2",
AutoAdvertise: true,
AutoAdvertise: &trueValue,
Addr: "2",
Timeout: 2 * time.Second,
Token: "2",
Auth: "2",
EnableSSL: true,
VerifySSL: true,
EnableSSL: &trueValue,
VerifySSL: &trueValue,
CAFile: "2",
CertFile: "2",
KeyFile: "2",
ServerAutoJoin: true,
ClientAutoJoin: true,
ServerAutoJoin: &trueValue,
ClientAutoJoin: &trueValue,
},
}

View File

@ -946,7 +946,7 @@ func TestJobDiff(t *testing.T) {
Objects: []*ObjectDiff{
{
Type: DiffTypeDeleted,
Name: "ParameretizedJob",
Name: "ParameterizedJob",
Fields: []*FieldDiff{
{
Type: DiffTypeDeleted,