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

Add the memoryLimitSupport requirement to OOM tests

Browse Source 
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>
Upstream-commit: e86b79fcccb23040feea079652fd9a7bf3458f1d
Component: engine
This commit is contained in:
Christy Perez
2015-11-10 18:06:13 -06:00
parent e7a1b04a89
commit 5a581803a8
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/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) {
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() {