InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43971 from thaJeztah/daemon_fix_hosts_validation_step1c3

Browse Source 
daemon: use initialized config struct in more tests
This commit is contained in:
Sebastiaan van Stijn
2022-08-18 21:30:07 +02:00
committed by GitHub
parent 1e97933876 327c8fc52f
commit 61e5cf083a
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/dockerd/daemon_test.go
View File

@@ -12,12 +12,13 @@ import (
)
func defaultOptions(t *testing.T, configFile string) *daemonOptions {
opts := newDaemonOptions(&config.Config{})
cfg, err := config.New()
assert.NilError(t, err)
opts := newDaemonOptions(cfg)
opts.flags = &pflag.FlagSet{}
opts.installFlags(opts.flags)
if err := installConfigFlags(opts.daemonConfig, opts.flags); err != nil {
t.Fatal(err)
}
err = installConfigFlags(opts.daemonConfig, opts.flags)
assert.NilError(t, err)
defaultDaemonConfigFile, err := getDefaultDaemonConfigFile()
assert.NilError(t, err)
opts.flags.StringVar(&opts.configFile, "config-file", defaultDaemonConfigFile, "")