From 671826c75df04eb2ada8b60e53eefcfb09b25319 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Thu, 8 Mar 2018 16:57:23 -0600 Subject: [PATCH] [integration] skip ppc64le oom tests for now These tests were enabled by changing a config option on the ci machines, instead of from a patch, so let me disable them for now on ppc64le and open up another patch to enable them, where I can find out what the issues are with them. Signed-off-by: Christopher Jones Upstream-commit: 620ddc78a1437feaa42f40853ef586d268991620 Component: engine --- .../engine/integration-cli/docker_cli_events_unix_test.go | 4 ++-- components/engine/integration-cli/docker_cli_run_unix_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_events_unix_test.go b/components/engine/integration-cli/docker_cli_events_unix_test.go index afac998e02..680030807e 100644 --- a/components/engine/integration-cli/docker_cli_events_unix_test.go +++ b/components/engine/integration-cli/docker_cli_events_unix_test.go @@ -49,7 +49,7 @@ func (s *DockerSuite) TestEventsRedirectStdout(c *check.C) { } func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) { - testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, swapMemorySupport) + testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, swapMemorySupport, NotPpc64le) errChan := make(chan error) go func() { @@ -79,7 +79,7 @@ func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) { } func (s *DockerSuite) TestEventsOOMDisableTrue(c *check.C) { - testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotArm, swapMemorySupport) + testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotArm, swapMemorySupport, NotPpc64le) errChan := make(chan error) observer, err := newEventObserver(c) diff --git a/components/engine/integration-cli/docker_cli_run_unix_test.go b/components/engine/integration-cli/docker_cli_run_unix_test.go index 952cf0a4ac..d817bc3b22 100644 --- a/components/engine/integration-cli/docker_cli_run_unix_test.go +++ b/components/engine/integration-cli/docker_cli_run_unix_test.go @@ -615,7 +615,7 @@ func (s *DockerSuite) TestRunWithInvalidPathforBlkioDeviceWriteIOps(c *check.C) } func (s *DockerSuite) TestRunOOMExitCode(c *check.C) { - testRequires(c, memoryLimitSupport, swapMemorySupport) + testRequires(c, memoryLimitSupport, swapMemorySupport, NotPpc64le) errChan := make(chan error) go func() { defer close(errChan)