Bläddra i källkod

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 <christy@linux.vnet.ibm.com>
Christy Perez 9 år sedan
förälder
incheckning
e86b79fccc
1 ändrade filer med 2 tillägg och 6 borttagningar
  1. 2 6
      integration-cli/docker_cli_events_unix_test.go

+ 2 - 6
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) {
 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)
 	errChan := make(chan error)
 	go func() {
 	go func() {
@@ -82,9 +80,7 @@ func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) {
 }
 }
 
 
 func (s *DockerSuite) TestEventsOOMDisableTrue(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)
 	errChan := make(chan error)
 	go func() {
 	go func() {