From 15f2e840f73253995c417c0941eea93c87a888be Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Tue, 23 Feb 2016 15:17:26 -0500 Subject: [PATCH] Fix flaky OOM tests If cgroup swap memory limit isn't enabled, then the -m flag doesn't work and the container that is created for both of these tests is very large. Because we are trying to run the containers out of memory, this takes a very long time and causes the tests to fail most of the time. Follow-up to #17913 Signed-off-by: Christopher Jones Upstream-commit: 3abf2a77414195d5b0c15f7fc88b7fd9aa4edaa8 Component: engine --- .../engine/integration-cli/docker_cli_events_unix_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 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 0211f85cf2..c5e48f2197 100644 --- a/components/engine/integration-cli/docker_cli_events_unix_test.go +++ b/components/engine/integration-cli/docker_cli_events_unix_test.go @@ -46,7 +46,7 @@ func (s *DockerSuite) TestEventsRedirectStdout(c *check.C) { } func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) { - testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO) + testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO, swapMemorySupport) errChan := make(chan error) go func() { @@ -76,7 +76,7 @@ func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) { } func (s *DockerSuite) TestEventsOOMDisableTrue(c *check.C) { - testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO, NotArm) + testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO, NotArm, swapMemorySupport) errChan := make(chan error) observer, err := newEventObserver(c)