From 2c2f6fd2728067a5d3ab6ea393d8b5593de4bc0c Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Thu, 7 May 2015 15:02:08 -0700 Subject: [PATCH] bump version back to 1.7.0-dev Signed-off-by: Jessica Frazelle --- VERSION | 2 +- integration-cli/docker_cli_run_test.go | 37 +++++++++++--------------- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/VERSION b/VERSION index 9c6d6293b1..de023c91b1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.1 +1.7.0-dev diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index e343007b0c..8849a2d1b1 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -3057,71 +3057,64 @@ func (s *DockerSuite) TestRunPidHostWithChildIsKillable(c *check.C) { } } -func TestRunWithTooSmallMemoryLimit(t *testing.T) { +func (s *DockerSuite) TestRunWithTooSmallMemoryLimit(c *check.C) { defer deleteAllContainers() // this memory limit is 1 byte less than the min, which is 4MB // https://github.com/docker/docker/blob/v1.5.0/daemon/create.go#L22 out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "run", "-m", "4194303", "busybox")) if err == nil || !strings.Contains(out, "Minimum memory limit allowed is 4MB") { - t.Fatalf("expected run to fail when using too low a memory limit: %q", out) + c.Fatalf("expected run to fail when using too low a memory limit: %q", out) } - - logDone("run - can't set too low memory limit") } -func TestRunWriteToProcAsound(t *testing.T) { +func (s *DockerSuite) TestRunWriteToProcAsound(c *check.C) { defer deleteAllContainers() code, err := runCommand(exec.Command(dockerBinary, "run", "busybox", "sh", "-c", "echo 111 >> /proc/asound/version")) if err == nil || code == 0 { - t.Fatal("standard container should not be able to write to /proc/asound") + c.Fatal("standard container should not be able to write to /proc/asound") } - logDone("run - ro write to /proc/asound") } -func TestRunReadProcTimer(t *testing.T) { +func (s *DockerSuite) TestRunReadProcTimer(c *check.C) { defer deleteAllContainers() out, code, err := runCommandWithOutput(exec.Command(dockerBinary, "run", "busybox", "cat", "/proc/timer_stats")) if err != nil || code != 0 { - t.Fatal(err) + c.Fatal(err) } if strings.Trim(out, "\n ") != "" { - t.Fatalf("expected to receive no output from /proc/timer_stats but received %q", out) + c.Fatalf("expected to receive no output from /proc/timer_stats but received %q", out) } - logDone("run - read /proc/timer_stats") } -func TestRunReadProcLatency(t *testing.T) { +func (s *DockerSuite) TestRunReadProcLatency(c *check.C) { // some kernels don't have this configured so skip the test if this file is not found // on the host running the tests. if _, err := os.Stat("/proc/latency_stats"); err != nil { - t.Skip() + c.Skip("kernel doesnt have latency_stats configured") return } defer deleteAllContainers() out, code, err := runCommandWithOutput(exec.Command(dockerBinary, "run", "busybox", "cat", "/proc/latency_stats")) if err != nil || code != 0 { - t.Fatal(err) + c.Fatal(err) } if strings.Trim(out, "\n ") != "" { - t.Fatalf("expected to receive no output from /proc/latency_stats but received %q", out) + c.Fatalf("expected to receive no output from /proc/latency_stats but received %q", out) } - logDone("run - read /proc/latency_stats") } -func TestMountIntoProc(t *testing.T) { +func (s *DockerSuite) TestMountIntoProc(c *check.C) { defer deleteAllContainers() code, err := runCommand(exec.Command(dockerBinary, "run", "-v", "/proc//sys", "busybox", "true")) if err == nil || code == 0 { - t.Fatal("container should not be able to mount into /proc") + c.Fatal("container should not be able to mount into /proc") } - logDone("run - mount into proc") } -func TestMountIntoSys(t *testing.T) { +func (s *DockerSuite) TestMountIntoSys(c *check.C) { defer deleteAllContainers() code, err := runCommand(exec.Command(dockerBinary, "run", "-v", "/sys/", "busybox", "true")) if err == nil || code == 0 { - t.Fatal("container should not be able to mount into /sys") + c.Fatal("container should not be able to mount into /sys") } - logDone("run - mount into sys") }