1f187e640c
Removes some custom handling, some of which were giving the wrong
error on failure ("expected no error" when we were checking for an
error).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
49 lines
1.2 KiB
Go
49 lines
1.2 KiB
Go
package config // import "github.com/docker/docker/daemon/config"
|
|
|
|
import (
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/opts"
|
|
"github.com/spf13/pflag"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func TestDaemonConfigurationMerge(t *testing.T) {
|
|
f, err := os.CreateTemp("", "docker-config-")
|
|
assert.NilError(t, err)
|
|
|
|
configFile := f.Name()
|
|
|
|
f.Write([]byte(`
|
|
{
|
|
"debug": true
|
|
}`))
|
|
|
|
f.Close()
|
|
|
|
conf := New()
|
|
|
|
flags := pflag.NewFlagSet("test", pflag.ContinueOnError)
|
|
flags.BoolVarP(&conf.Debug, "debug", "D", false, "")
|
|
flags.BoolVarP(&conf.AutoRestart, "restart", "r", true, "")
|
|
flags.StringVar(&conf.LogConfig.Type, "log-driver", "json-file", "")
|
|
flags.Var(opts.NewNamedMapOpts("log-opts", conf.LogConfig.Config, nil), "log-opt", "")
|
|
assert.Check(t, flags.Set("restart", "true"))
|
|
assert.Check(t, flags.Set("log-driver", "syslog"))
|
|
assert.Check(t, flags.Set("log-opt", "tag=from_flag"))
|
|
|
|
cc, err := MergeDaemonConfigurations(conf, flags, configFile)
|
|
assert.NilError(t, err)
|
|
|
|
assert.Check(t, cc.Debug)
|
|
assert.Check(t, cc.AutoRestart)
|
|
|
|
expectedLogConfig := LogConfig{
|
|
Type: "syslog",
|
|
Config: map[string]string{"tag": "from_flag"},
|
|
}
|
|
|
|
assert.Check(t, is.DeepEqual(expectedLogConfig, cc.LogConfig))
|
|
}
|