clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11965 from duglin/DEBUG

Browse Source 
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
This commit is contained in:
Jessie Frazelle
2015-05-12 18:24:04 -07:00
parent 3985f17812 534ed8c2d4
commit 36d995a291
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_daemon_test.go
+6 -6
View File
@@ -232,8 +232,8 @@ func (s *DockerDaemonSuite) TestDaemonFlagD(c *check.C) {
c.Fatal(err)
}
content, _ := ioutil.ReadFile(s.d.logFile.Name())
if !strings.Contains(string(content), `level=debug`) {
c.Fatalf(`Missing level="debug" in log file using -D:\n%s`, string(content))
if strings.Contains(string(content), `level=debug`) {
c.Fatalf(`Should not have level="debug" in log file using -D:\n%s`, string(content))
}
}
@@ -242,8 +242,8 @@ func (s *DockerDaemonSuite) TestDaemonFlagDebug(c *check.C) {
c.Fatal(err)
}
content, _ := ioutil.ReadFile(s.d.logFile.Name())
if !strings.Contains(string(content), `level=debug`) {
c.Fatalf(`Missing level="debug" in log file using --debug:\n%s`, string(content))
if strings.Contains(string(content), `level=debug`) {
c.Fatalf(`Should not have level="debug" in log file using --debug:\n%s`, string(content))
}
}
@@ -252,8 +252,8 @@ func (s *DockerDaemonSuite) TestDaemonFlagDebugLogLevelFatal(c *check.C) {
c.Fatal(err)
}
content, _ := ioutil.ReadFile(s.d.logFile.Name())
if !strings.Contains(string(content), `level=debug`) {
c.Fatalf(`Missing level="debug" in log file when using both --debug and --log-level=fatal:\n%s`, string(content))
if strings.Contains(string(content), `level=debug`) {
c.Fatalf(`Should not have level="debug" in log file when using both --debug and --log-level=fatal:\n%s`, string(content))
}
}