docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17913 from clnperez/oom-test-requires 

Add the memoryLimitSupport requirement to Events OOM tests
This commit is contained in:
Antonio Murdaca 2015-11-11 23:24:10 +01:00
parent 6c82fba2b3 e86b79fccc
commit 9d4e2f3992
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
integration-cli/docker_cli_events_unix_test.go
View File

@ -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, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO)
testRequires(c, oomControl)
testRequires(c, 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, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO)
testRequires(c, oomControl)
testRequires(c, NotGCCGO)
errChan := make(chan error) errChan := make(chan error)
go func() { go func() {