1
0
mirror of https://github.com/moby/moby.git synced 2025-07-29 07:21:35 +03:00

Merge pull request #34332 from clnperez/logrus-revendor

revendor logrus and x/crypto
This commit is contained in:
Yong Tang
2017-09-14 11:29:05 -07:00
committed by GitHub
47 changed files with 5143 additions and 2661 deletions

View File

@ -2159,9 +2159,9 @@ func (s *DockerDaemonSuite) TestRunLinksChanged(c *check.C) {
}
func (s *DockerDaemonSuite) TestDaemonStartWithoutColors(c *check.C) {
testRequires(c, DaemonIsLinux, NotPpc64le)
testRequires(c, DaemonIsLinux)
infoLog := "\x1b[34mINFO\x1b"
infoLog := "\x1b[36mINFO\x1b"
b := bytes.NewBuffer(nil)
done := make(chan bool)
@ -2209,7 +2209,7 @@ func (s *DockerDaemonSuite) TestDaemonStartWithoutColors(c *check.C) {
}
func (s *DockerDaemonSuite) TestDaemonDebugLog(c *check.C) {
testRequires(c, DaemonIsLinux, NotPpc64le)
testRequires(c, DaemonIsLinux)
debugLog := "\x1b[37mDEBU\x1b"