docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19715 from coolljt0725/fix_test_daemon 

Test utils: fix daemon start utils
This commit is contained in:
Doug Davis 2016-01-26 10:08:50 -05:00
parent e5b5c0ebe8 e88258ca2e
commit fc8e344297
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 // If we don't explicitly set the log-level or debug flag(-D) then
// turn on debug mode // turn on debug mode
foundIt := false foundLog := false
foundSd := false
for _, a := range arg { for _, a := range arg {
if strings.Contains(a, "--log-level") || strings.Contains(a, "-D") || strings.Contains(a, "--debug") { 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") args = append(args, "--debug")
} }
if d.storageDriver != "" && !foundSd {
if d.storageDriver != "" {
args = append(args, "--storage-driver", d.storageDriver) args = append(args, "--storage-driver", d.storageDriver)
} }