toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34332 from clnperez/logrus-revendor

Browse Source 
revendor logrus and x/crypto
Upstream-commit: 2a54dc080471476037c87cc6961cc126368ffdd9
Component: engine
This commit is contained in:
Yong Tang
2017-09-14 11:29:05 -07:00
committed by GitHub
parent c95e22b252 97847089f1
commit f34f36be87
47 changed files with 5143 additions and 2661 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_daemon_test.go
+3 -3
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"