beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove testing logrus output from ppc64le

Browse source 
This removes two tests on ppc64le.

There is an old bug with a syscall on power #8653, that causes
logrus to default to using logfmt. These two tests look for
logrus format specific strings, and fail if they don't see it.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
This commit is contained in:
Christopher Jones 2016-02-09 18:02:18 -05:00
parent f5ed72c931
commit 736e93a468
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
integration-cli/docker_cli_daemon_test.go
View file

@ -2068,7 +2068,7 @@ func (s *DockerDaemonSuite) TestRunLinksChanged(c *check.C) {
}
func (s *DockerDaemonSuite) TestDaemonStartWithoutColors(c *check.C) {
testRequires(c, DaemonIsLinux)
testRequires(c, DaemonIsLinux, NotPpc64le)
newD := NewDaemon(c)
infoLog := "\x1b[34mINFO\x1b"
@ -2097,7 +2097,7 @@ func (s *DockerDaemonSuite) TestDaemonStartWithoutColors(c *check.C) {
}
func (s *DockerDaemonSuite) TestDaemonDebugLog(c *check.C) {
testRequires(c, DaemonIsLinux)
testRequires(c, DaemonIsLinux, NotPpc64le)
newD := NewDaemon(c)
debugLog := "\x1b[37mDEBU\x1b"

4
integration-cli/requirements.go
View file

@ -33,6 +33,10 @@ var (
func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm" },
"Test requires a daemon not running on ARM",
}
NotPpc64le = testRequirement{
func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "ppc64le" },
"Test requires a daemon not running on ppc64le",
}
SameHostDaemon = testRequirement{
func() bool { return isLocalDaemon },
"Test requires docker daemon to run on the same machine as CLI",