From 736e93a468fe8b8530ec5d00b9be7bbd53e306fc Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Tue, 9 Feb 2016 18:02:18 -0500 Subject: [PATCH] Remove testing logrus output from ppc64le 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 --- integration-cli/docker_cli_daemon_test.go | 4 ++-- integration-cli/requirements.go | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index 535c2da85c..9c9256607f 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -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" diff --git a/integration-cli/requirements.go b/integration-cli/requirements.go index f155e226f2..d68f9fb852 100644 --- a/integration-cli/requirements.go +++ b/integration-cli/requirements.go @@ -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",