From 5a581803a8bc8d39a13271194cfe2c5015a14c23 Mon Sep 17 00:00:00 2001 From: Christy Perez Date: Tue, 10 Nov 2015 18:06:13 -0600 Subject: [PATCH] Add the memoryLimitSupport requirement to OOM tests The docker run commands in these tests uses the -m flag, so the tests should require that it's supported to run. Fixes 17215 (maybe) Signed-off-by: Christy Perez Upstream-commit: e86b79fcccb23040feea079652fd9a7bf3458f1d Component: engine --- .../engine/integration-cli/docker_cli_events_unix_test.go | 8 ++------ 1 file changed, 2 insertions(+), 6 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 b45620fdf0..c65394349e 100644 --- a/components/engine/integration-cli/docker_cli_events_unix_test.go +++ b/components/engine/integration-cli/docker_cli_events_unix_test.go @@ -46,9 +46,7 @@ func (s *DockerSuite) TestEventsRedirectStdout(c *check.C) { } func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) { - testRequires(c, DaemonIsLinux) - testRequires(c, oomControl) - testRequires(c, NotGCCGO) + testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO) errChan := make(chan error) go func() { @@ -82,9 +80,7 @@ func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) { } func (s *DockerSuite) TestEventsOOMDisableTrue(c *check.C) { - testRequires(c, DaemonIsLinux) - testRequires(c, oomControl) - testRequires(c, NotGCCGO) + testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO) errChan := make(chan error) go func() {