فهرست منبع

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

PPC64LE: Remove testing logrus output from ppc64le
Brian Goff 9 سال پیش
والد
کامیت
cfa806378e
2فایلهای تغییر یافته به همراه6 افزوده شده و 2 حذف شده
  1. 2 2
      integration-cli/docker_cli_daemon_test.go
  2. 4 0
      integration-cli/requirements.go

+ 2 - 2
integration-cli/docker_cli_daemon_test.go

@@ -2107,7 +2107,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"
@@ -2136,7 +2136,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 - 0
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",