Break out Mocks

observer/obs_conf_test.go

@@ -7,57 +7,9 @@ import (
 
 	"github.com/letsencrypt/boulder/cmd"
 	p "github.com/letsencrypt/boulder/observer/probers"
-	"gopkg.in/yaml.v2"
+	_ "github.com/letsencrypt/boulder/observer/probers/mock"
 )
 
-type MockConfigurer struct {
-	Valid    bool               `yaml:"valid"`
-	ErrMsg   string             `yaml:"errmsg"`
-	PName    string             `yaml:"pname"`
-	PKind    string             `yaml:"pkind"`
-	PTook    cmd.ConfigDuration `yaml:"ptook"`
-	PSuccess bool               `yaml:"psuccess"`
-}
-
-func (c MockConfigurer) UnmarshalSettings(settings []byte) (p.Configurer, error) {
-	var conf MockConfigurer
-	err := yaml.Unmarshal(settings, &conf)
-	if err != nil {
-		return nil, err
-	}
-	return conf, nil
-}
-
-func (c MockConfigurer) Validate() error {
-	if !c.Valid {
-		return errors.New(c.ErrMsg)
-	}
-	return nil
-}
-
-func (c MockConfigurer) AsProbe() p.Prober {
-	return MockProber{c.PName, c.PKind, c.PTook, c.PSuccess}
-}
-
-type MockProber struct {
-	name    string
-	kind    string
-	took    cmd.ConfigDuration
-	success bool
-}
-
-func (p MockProber) Name() string {
-	return p.name
-}
-
-func (p MockProber) Kind() string {
-	return p.kind
-}
-
-func (p MockProber) Probe(timeout time.Duration) (bool, time.Duration) {
-	return p.success, p.took.Duration
-}
-
 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}
 
@@ -69,10 +21,6 @@ var invalidMonConf = &MonConf{cfgDur, 10, "MockConf", invalidMonSettings, false}
 
 var dbzErr = errors.New("over 9000")
 
-func init() {
-	p.Register("MockConf", MockConfigurer{})
-}
-
 func TestObsConf_validateMonConfs(t *testing.T) {
 	type fields struct {
 		Syslog    cmd.SyslogConfig

observer/probers/mock/mock.go

@@ -0,0 +1,26 @@
+package observer
+
+import (
+	"time"
+
+	"github.com/letsencrypt/boulder/cmd"
+)
+
+type MockProber struct {
+	name    string
+	kind    string
+	took    cmd.ConfigDuration
+	success bool
+}
+
+func (p MockProber) Name() string {
+	return p.name
+}
+
+func (p MockProber) Kind() string {
+	return p.kind
+}
+
+func (p MockProber) Probe(timeout time.Duration) (bool, time.Duration) {
+	return p.success, p.took.Duration
+}

observer/probers/mock/mock_conf.go

@@ -0,0 +1,42 @@
+package observer
+
+import (
+	"errors"
+
+	"github.com/letsencrypt/boulder/cmd"
+	p "github.com/letsencrypt/boulder/observer/probers"
+	"gopkg.in/yaml.v2"
+)
+
+type MockConfigurer struct {
+	Valid    bool               `yaml:"valid"`
+	ErrMsg   string             `yaml:"errmsg"`
+	PName    string             `yaml:"pname"`
+	PKind    string             `yaml:"pkind"`
+	PTook    cmd.ConfigDuration `yaml:"ptook"`
+	PSuccess bool               `yaml:"psuccess"`
+}
+
+func (c MockConfigurer) UnmarshalSettings(settings []byte) (p.Configurer, error) {
+	var conf MockConfigurer
+	err := yaml.Unmarshal(settings, &conf)
+	if err != nil {
+		return nil, err
+	}
+	return conf, nil
+}
+
+func (c MockConfigurer) Validate() error {
+	if !c.Valid {
+		return errors.New(c.ErrMsg)
+	}
+	return nil
+}
+
+func (c MockConfigurer) AsProbe() p.Prober {
+	return MockProber{c.PName, c.PKind, c.PTook, c.PSuccess}
+}
+
+func init() {
+	p.Register("MockConf", MockConfigurer{})
+}