kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

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

Browse source 
PPC64LE: Remove testing logrus output from ppc64le
This commit is contained in:
Brian Goff 2016-02-10 09:07:47 -05:00
commit cfa806378e
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

@ -2107,7 +2107,7 @@ func (s *DockerDaemonSuite) TestRunLinksChanged(c *check.C) {
} }
func (s *DockerDaemonSuite) TestDaemonStartWithoutColors(c *check.C) { func (s *DockerDaemonSuite) TestDaemonStartWithoutColors(c *check.C) {
testRequires(c, DaemonIsLinux) testRequires(c, DaemonIsLinux, NotPpc64le)
newD := NewDaemon(c) newD := NewDaemon(c)
infoLog := "\x1b[34mINFO\x1b" infoLog := "\x1b[34mINFO\x1b"
@ -2136,7 +2136,7 @@ func (s *DockerDaemonSuite) TestDaemonStartWithoutColors(c *check.C) {
} }
func (s *DockerDaemonSuite) TestDaemonDebugLog(c *check.C) { func (s *DockerDaemonSuite) TestDaemonDebugLog(c *check.C) {
testRequires(c, DaemonIsLinux) testRequires(c, DaemonIsLinux, NotPpc64le)
newD := NewDaemon(c) newD := NewDaemon(c)
debugLog := "\x1b[37mDEBU\x1b" 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" }, func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm" },
"Test requires a daemon not running on 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{ SameHostDaemon = testRequirement{
func() bool { return isLocalDaemon }, func() bool { return isLocalDaemon },
"Test requires docker daemon to run on the same machine as CLI", "Test requires docker daemon to run on the same machine as CLI",