dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-05 07:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11331 from jfrazelle/update-logrus

Browse Source 
Update logrus to 0.6.6
This commit is contained in:
Michael Crosby
2015-03-11 16:18:22 -07:00
parent 254b6f8946 89e2e5fc55
commit 5494432f91
26 changed files with 758 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
integration-cli/docker_cli_build_test.go
View File

@@ -5042,8 +5042,8 @@ func TestBuildSpaces(t *testing.T) {
}
// Skip over the times
e1 := err1.Error()[strings.Index(err1.Error(), `level="`):]
e2 := err2.Error()[strings.Index(err1.Error(), `level="`):]
e1 := err1.Error()[strings.Index(err1.Error(), `level=`):]
e2 := err2.Error()[strings.Index(err1.Error(), `level=`):]
// Ignore whitespace since that's what were verifying doesn't change stuff
if strings.Replace(e1, " ", "", -1) != strings.Replace(e2, " ", "", -1) {
@@ -5056,8 +5056,8 @@ func TestBuildSpaces(t *testing.T) {
}
// Skip over the times
e1 = err1.Error()[strings.Index(err1.Error(), `level="`):]
e2 = err2.Error()[strings.Index(err1.Error(), `level="`):]
e1 = err1.Error()[strings.Index(err1.Error(), `level=`):]
e2 = err2.Error()[strings.Index(err1.Error(), `level=`):]
// Ignore whitespace since that's what were verifying doesn't change stuff
if strings.Replace(e1, " ", "", -1) != strings.Replace(e2, " ", "", -1) {
@@ -5070,8 +5070,8 @@ func TestBuildSpaces(t *testing.T) {
}
// Skip over the times
e1 = err1.Error()[strings.Index(err1.Error(), `level="`):]
e2 = err2.Error()[strings.Index(err1.Error(), `level="`):]
e1 = err1.Error()[strings.Index(err1.Error(), `level=`):]
e2 = err2.Error()[strings.Index(err1.Error(), `level=`):]
// Ignore whitespace since that's what were verifying doesn't change stuff
if strings.Replace(e1, " ", "", -1) != strings.Replace(e2, " ", "", -1) {

10
integration-cli/docker_cli_daemon_test.go
View File

@@ -244,7 +244,7 @@ func TestDaemonLoggingLevel(t *testing.T) {
}
d.Stop()
content, _ := ioutil.ReadFile(d.logFile.Name())
if !strings.Contains(string(content), `level="debug"`) {
if !strings.Contains(string(content), `level=debug`) {
t.Fatalf(`Missing level="debug" in log file:\n%s`, string(content))
}
@@ -254,7 +254,7 @@ func TestDaemonLoggingLevel(t *testing.T) {
}
d.Stop()
content, _ = ioutil.ReadFile(d.logFile.Name())
if strings.Contains(string(content), `level="debug"`) {
if strings.Contains(string(content), `level=debug`) {
t.Fatalf(`Should not have level="debug" in log file:\n%s`, string(content))
}
@@ -264,7 +264,7 @@ func TestDaemonLoggingLevel(t *testing.T) {
}
d.Stop()
content, _ = ioutil.ReadFile(d.logFile.Name())
if !strings.Contains(string(content), `level="debug"`) {
if !strings.Contains(string(content), `level=debug`) {
t.Fatalf(`Missing level="debug" in log file using -D:\n%s`, string(content))
}
@@ -274,7 +274,7 @@ func TestDaemonLoggingLevel(t *testing.T) {
}
d.Stop()
content, _ = ioutil.ReadFile(d.logFile.Name())
if !strings.Contains(string(content), `level="debug"`) {
if !strings.Contains(string(content), `level=debug`) {
t.Fatalf(`Missing level="debug" in log file using --debug:\n%s`, string(content))
}
@@ -284,7 +284,7 @@ func TestDaemonLoggingLevel(t *testing.T) {
}
d.Stop()
content, _ = ioutil.ReadFile(d.logFile.Name())
if !strings.Contains(string(content), `level="debug"`) {
if !strings.Contains(string(content), `level=debug`) {
t.Fatalf(`Missing level="debug" in log file when using both --debug and --log-level=fatal:\n%s`, string(content))
}