1. docker
  2. Commit cfa806378eafd159fce4b1158b215564419680d0
Browse code

Merge pull request #20174 from tophj-ibm/remove-power-from-logrus-tests

PPC64LE: Remove testing logrus output from ppc64le

Brian Goff authored on 2016/02/10 23:07:47
Showing 2 changed files
integration-cli/docker_cli_daemon_test.go
History View file @ cfa8063
... ... 
@@ -2107,7 +2107,7 @@ func (s *DockerDaemonSuite) TestRunLinksChanged(c *check.C) {
2107 2107 
 }
2108 2108
2109 2109 
 func (s *DockerDaemonSuite) TestDaemonStartWithoutColors(c *check.C) {
2110 
-	testRequires(c, DaemonIsLinux)
2110 
+	testRequires(c, DaemonIsLinux, NotPpc64le)
2111 2111 
 	newD := NewDaemon(c)
2112 2112
2113 2113 
 	infoLog := "\x1b[34mINFO\x1b"
... ... 
@@ -2136,7 +2136,7 @@ func (s *DockerDaemonSuite) TestDaemonStartWithoutColors(c *check.C) {
2136 2136 
 }
2137 2137
2138 2138 
 func (s *DockerDaemonSuite) TestDaemonDebugLog(c *check.C) {
2139 
-	testRequires(c, DaemonIsLinux)
2139 
+	testRequires(c, DaemonIsLinux, NotPpc64le)
2140 2140 
 	newD := NewDaemon(c)
2141 2141
2142 2142 
 	debugLog := "\x1b[37mDEBU\x1b"
integration-cli/requirements.go
History View file @ cfa8063
... ... 
@@ -33,6 +33,10 @@ var (
33 33 
 		func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm" },
34 34 
 		"Test requires a daemon not running on ARM",
35 35 
 	}
36 
+	NotPpc64le = testRequirement{
37 
+		func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "ppc64le" },
38 
+		"Test requires a daemon not running on ppc64le",
39 
+	}
36 40 
 	SameHostDaemon = testRequirement{
37 41 
 		func() bool { return isLocalDaemon },
38 42 
 		"Test requires docker daemon to run on the same machine as CLI",