docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity

Merge pull request #20627 from tophj-ibm/fix-flaky-oom-tests

Browse Source 
Fix flaky OOM tests
Upstream-commit: a9e627422458a530a9af8fd01d7838eec51b03ab
Component: engine
This commit is contained in:
Arnaud Porterie
2016-02-23 15:37:32 -08:00
parent d7e2b23289 15f2e840f7
commit 271b18177c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/integration-cli/docker_cli_events_unix_test.go
View File

@@ -46,7 +46,7 @@ func (s *DockerSuite) TestEventsRedirectStdout(c *check.C) {
}
func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) {
testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO)
testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO, swapMemorySupport)
errChan := make(chan error)
go func() {
@@ -76,7 +76,7 @@ func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) {
}
func (s *DockerSuite) TestEventsOOMDisableTrue(c *check.C) {
testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO, NotArm)
testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO, NotArm, swapMemorySupport)
errChan := make(chan error)
observer, err := newEventObserver(c)