Remove testing logrus output from ppc64le

tophj-ibm · tophj-ibm · commit 736e93a468fe · 2016-02-09T18:02:18.000-05:00
This removes two tests on ppc64le. There is an old bug with a syscall on power moby#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>
diff --git 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
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -2068,7 +2068,7 @@ func (s DockerDaemonSuite) TestRunLinksChanged(c check.C) {`
`2068`	`2068`	`}`
`2069`	`2069`
`2070`	`2070`	`func (s DockerDaemonSuite) TestDaemonStartWithoutColors(c check.C) {`
`2071`		`- testRequires(c, DaemonIsLinux)`
	`2071`	`+ testRequires(c, DaemonIsLinux, NotPpc64le)`
`2072`	`2072`	`newD := NewDaemon(c)`
`2073`	`2073`
`2074`	`2074`	`infoLog := "\x1b[34mINFO\x1b"`
`@@ -2097,7 +2097,7 @@ func (s DockerDaemonSuite) TestDaemonStartWithoutColors(c check.C) {`
`2097`	`2097`	`}`
`2098`	`2098`
`2099`	`2099`	`func (s DockerDaemonSuite) TestDaemonDebugLog(c check.C) {`
`2100`		`- testRequires(c, DaemonIsLinux)`
	`2100`	`+ testRequires(c, DaemonIsLinux, NotPpc64le)`
`2101`	`2101`	`newD := NewDaemon(c)`
`2102`	`2102`
`2103`	`2103`	`debugLog := "\x1b[37mDEBU\x1b"`