0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Test utils: fix daemon start utils

Browse source 
User call `Start` could with args, and the args could
contains `--storage-driver`, but in `Start`, it will add
`--storage-driver` even though user has specified `--storage-driver`
in args.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
This commit is contained in:
Lei Jitang 2016-01-26 08:31:50 -05:00
parent 5b0183e91c
commit e88258ca2e
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
integration-cli/docker_utils.go
View file

@ -224,17 +224,20 @@ func (d *Daemon) Start(arg ...string) error {
// If we don't explicitly set the log-level or debug flag(-D) then
// turn on debug mode
foundIt := false
foundLog := false
foundSd := false
for _, a := range arg {
if strings.Contains(a, "--log-level") || strings.Contains(a, "-D") || strings.Contains(a, "--debug") {
foundIt = true
foundLog = true
}
if strings.Contains(a, "--storage-driver") {
foundSd = true
}
}
if !foundIt {
if !foundLog {
args = append(args, "--debug")
}
if d.storageDriver != "" {
if d.storageDriver != "" && !foundSd {
args = append(args, "--storage-driver", d.storageDriver)
}