Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

config: make tests more robust #81

Merged
merged 1 commit into from Oct 17, 2019
Merged

config: make tests more robust #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions framework/config/loader_test.go
View file
Open in desktop
Expand Up @@ -54,6 +54,7 @@ func TestLoad(t *testing.T) {
root := new(Area)
require.NoError(t, flagSet.Set("flamingo-config", "baz: bam"))
require.NoError(t, flagSet.Set("flamingo-config", "foo.bar.test: 'hello'"))
defer func() { initFlagSet() }()
err := Load(root, "testdata/valid")
assert.NoError(t, err)
assert.Contains(t, root.Configuration.Flat(), "area")
Expand All @@ -77,6 +78,7 @@ func TestLoad(t *testing.T) {
root := new(Area)
assert.Panics(t, func() {
require.NoError(t, flagSet.Set("flamingo-config", "baz"))
defer func() { initFlagSet() }()

_ = Load(root, "testdata/valid")
})
Expand Down
4 changes: 4 additions & 0 deletions framework/config/module.go
View file
Open in desktop
Expand Up @@ -32,6 +32,10 @@ type (
var flagSet *pflag.FlagSet

func init() {
initFlagSet()
}

func initFlagSet() {
flagSet = pflag.NewFlagSet("flamingo.config", pflag.ContinueOnError)
flagSet.BoolVar(&debugLog, "flamingo-config-log", false, "enable flamingo config loader logging")
flagSet.StringArrayVar(&additionalConfig, "flamingo-config", []string{}, "add multiple flamingo config additions")
Expand Down