Browse code
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 authored on 2015/11/11 09:06:13Showing 1 changed files
| ... | ... |
@@ -46,9 +46,7 @@ func (s *DockerSuite) TestEventsRedirectStdout(c *check.C) {
|
| 46 | 46 |
} |
| 47 | 47 |
|
| 48 | 48 |
func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) {
|
| 49 |
- testRequires(c, DaemonIsLinux) |
|
| 50 |
- testRequires(c, oomControl) |
|
| 51 |
- testRequires(c, NotGCCGO) |
|
| 49 |
+ testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO) |
|
| 52 | 50 |
|
| 53 | 51 |
errChan := make(chan error) |
| 54 | 52 |
go func() {
|
| ... | ... |
@@ -82,9 +80,7 @@ func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) {
|
| 82 | 82 |
} |
| 83 | 83 |
|
| 84 | 84 |
func (s *DockerSuite) TestEventsOOMDisableTrue(c *check.C) {
|
| 85 |
- testRequires(c, DaemonIsLinux) |
|
| 86 |
- testRequires(c, oomControl) |
|
| 87 |
- testRequires(c, NotGCCGO) |
|
| 85 |
+ testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotGCCGO) |
|
| 88 | 86 |
|
| 89 | 87 |
errChan := make(chan error) |
| 90 | 88 |
go func() {
|