Skip to content

Instantly share code, notes, and snippets.

@runcom
Created September 18, 2015 21:43
Show Gist options
  • Save runcom/86cbc6605cf6d794c3ef to your computer and use it in GitHub Desktop.
Save runcom/86cbc6605cf6d794c3ef to your computer and use it in GitHub Desktop.
diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go
index a8fdac0..a3d0a35 100644
--- a/integration-cli/docker_cli_run_unix_test.go
+++ b/integration-cli/docker_cli_run_unix_test.go
@@ -227,6 +227,7 @@ func (s *DockerSuite) TestRunEchoStdoutWitCPUShares(c *check.C) {
func (s *DockerSuite) TestRunEchoStdoutWithCPUSharesAndMemoryLimit(c *check.C) {
testRequires(c, cpuShare)
testRequires(c, memoryLimitSupport)
+ testRequires(c, swapMemorySupport)
out, _ := dockerCmd(c, "run", "--cpu-shares", "1000", "-m", "16m", "busybox", "echo", "test")
if out != "test\n" {
c.Errorf("container should've printed 'test', got %q instead", out)
@@ -290,7 +291,9 @@ func (s *DockerSuite) TestRunOOMExitCode(c *check.C) {
// "test" should be printed
func (s *DockerSuite) TestRunEchoStdoutWithMemoryLimit(c *check.C) {
+ testRequires(c, NativeExecDriver)
testRequires(c, memoryLimitSupport)
+ testRequires(c, swapMemorySupport)
out, _ := dockerCmd(c, "run", "-m", "16m", "busybox", "echo", "test")
out = strings.Trim(out, "\r\n")
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment