toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Add the memoryLimitSupport requirement to Events OOM tests
Upstream-commit: 9d4e2f3992553b660d690093a0a294d1633b7dc6
Component: engine
This commit is contained in:
Antonio Murdaca
2015-11-11 23:24:10 +01:00
parent 470099dd9c 5a581803a8
commit 049a764149
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_events_unix_test.go
+2 -6
View File
@@ -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() {