From 5d93af558add10c9bed4839d74de43a7199cc85b Mon Sep 17 00:00:00 2001 From: beautifulentropy Date: Tue, 16 Mar 2021 18:33:46 -0700 Subject: [PATCH] Adding a const --- observer/obs_conf_test.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/observer/obs_conf_test.go b/observer/obs_conf_test.go index cd5df025e416..c54b64fba569 100644 --- a/observer/obs_conf_test.go +++ b/observer/obs_conf_test.go @@ -10,8 +10,14 @@ import ( _ "github.com/letsencrypt/boulder/observer/probers/mock" ) -var validMonSettings = p.Settings{"valid": true, "errmsg": "don't see this", "pname": "foo", "pkind": "bar", "ptook": "1s", "success": true} -var invalidMonSettings = p.Settings{"valid": false, "errmsg": "over 9000", "pname": "foo", "pkind": "bar", "ptook": "1s", "success": true} +const ( + dbzErrMsg = "over 9000" +) + +var dbzErr = errors.New(dbzErrMsg) + +var validMonSettings = p.Settings{"valid": true, "pname": "foo", "pkind": "bar"} +var invalidMonSettings = p.Settings{"valid": false, "errmsg": dbzErrMsg, "pname": "foo", "pkind": "bar"} var cfgSyslog = cmd.SyslogConfig{StdoutLevel: 6, SyslogLevel: 6} var cfgDur = cmd.ConfigDuration{Duration: time.Second * 5} @@ -19,8 +25,6 @@ var cfgDur = cmd.ConfigDuration{Duration: time.Second * 5} var validMonConf = &MonConf{cfgDur, 10, "MockConf", validMonSettings, true} var invalidMonConf = &MonConf{cfgDur, 10, "MockConf", invalidMonSettings, false} -var dbzErr = errors.New("over 9000") - func TestObsConf_validateMonConfs(t *testing.T) { type fields struct { Syslog cmd.SyslogConfig @@ -35,8 +39,10 @@ func TestObsConf_validateMonConfs(t *testing.T) { }{ // valid {"1 valid", fields{cfgSyslog, ":9090", []*MonConf{validMonConf}}, []error{}, true}, - {"1 valid, 1 invalid", fields{cfgSyslog, ":9090", []*MonConf{validMonConf, invalidMonConf}}, []error{dbzErr}, true}, - {"1 invalid, 2 invalid", fields{cfgSyslog, ":9090", []*MonConf{validMonConf, invalidMonConf, invalidMonConf}}, []error{dbzErr, dbzErr}, true}, + {"1 valid, 1 invalid", fields{ + cfgSyslog, ":9090", []*MonConf{validMonConf, invalidMonConf}}, []error{dbzErr}, true}, + {"1 invalid, 2 invalid", fields{ + cfgSyslog, ":9090", []*MonConf{validMonConf, invalidMonConf, invalidMonConf}}, []error{dbzErr, dbzErr}, true}, // invalid {"no valid mons", fields{cfgSyslog, ":9090", []*MonConf{invalidMonConf}}, []error{dbzErr}, false}, {"no mons at all", fields{cfgSyslog, ":9090", []*MonConf{}}, []error{errors.New("no monitors provided")}, false},