c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add basic unittests for the config related functionality

Browse source
This commit is contained in:
Arturo Filastò 2018-06-22 11:01:15 +02:00
commit 1bba0c7899
5 changed files with 102 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

22
config/parser.go
View file

@ -3,7 +3,6 @@ package config
import (
"encoding/json"
"io/ioutil"
"os"
"path/filepath"
"sync"
@ -14,21 +13,6 @@ import (
// ReadConfig reads the configuration from the path
func ReadConfig(path string) (*Config, error) {
b, err := ioutil.ReadFile(path)
if os.IsNotExist(err) {
c := &Config{}
if err = c.Default(); err != nil {
return nil, errors.Wrap(err, "defaulting")
}
if err = c.Validate(); err != nil {
return nil, errors.Wrap(err, "validating")
}
return c, nil
}
if err != nil {
return nil, errors.Wrap(err, "reading file")
}
@ -43,9 +27,9 @@ func ReadConfig(path string) (*Config, error) {
// ParseConfig returns config from JSON bytes.
func ParseConfig(b []byte) (*Config, error) {
c := &Config{}
var c Config
if err := json.Unmarshal(b, c); err != nil {
if err := json.Unmarshal(b, &c); err != nil {
return nil, errors.Wrap(err, "parsing json")
}
@ -57,7 +41,7 @@ func ParseConfig(b []byte) (*Config, error) {
return nil, errors.Wrap(err, "validating")
}
return c, nil
return &c, nil
}
// Config for the OONI Probe installation