diff options
author | Brian Goff <cpuguy83@gmail.com> | 2016-03-29 15:24:05 -0700 |
---|---|---|
committer | Brian Goff <cpuguy83@gmail.com> | 2016-03-29 15:24:05 -0700 |
commit | 5106c51666ce3452454d63141b259aa7d3713e90 (patch) | |
tree | bc05bdc6b4fc57bc662e199cfef8d0865fd33efd | |
parent | 8899896992d855b3e039c5f11ecafd83e8e45757 (diff) | |
download | docker-5106c51666ce3452454d63141b259aa7d3713e90.tar.gz |
More logs for `TestDaemonNoSpaceleftOnDeviceError`
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
-rw-r--r-- | integration-cli/docker_cli_daemon_test.go | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index 39e68d1107..39e4989548 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -1825,27 +1825,28 @@ func (s *DockerDaemonSuite) TestDaemonNoSpaceleftOnDeviceError(c *check.C) { // create a 2MiB image and mount it as graph root cmd := exec.Command("dd", "of=/tmp/testfs.img", "bs=1M", "seek=2", "count=0") - if err := cmd.Run(); err != nil { - c.Fatalf("dd failed: %v", err) - } + out, err := cmd.CombinedOutput() + c.Assert(err, checker.IsNil, check.Commentf(string(out))) + cmd = exec.Command("mkfs.ext4", "-F", "/tmp/testfs.img") - if err := cmd.Run(); err != nil { - c.Fatalf("mkfs.ext4 failed: %v", err) - } + out, err = cmd.CombinedOutput() + c.Assert(err, checker.IsNil, check.Commentf(string(out))) + cmd = exec.Command("mkdir", "-p", "/tmp/testfs-mount") - if err := cmd.Run(); err != nil { - c.Fatalf("mkdir failed: %v", err) - } + out, err = cmd.CombinedOutput() + c.Assert(err, checker.IsNil, check.Commentf(string(out))) + cmd = exec.Command("mount", "-t", "ext4", "-no", "loop,rw", "/tmp/testfs.img", "/tmp/testfs-mount") - if err := cmd.Run(); err != nil { - c.Fatalf("mount failed: %v", err) - } - err := s.d.Start("--graph", "/tmp/testfs-mount") + out, err = cmd.CombinedOutput() + c.Assert(err, checker.IsNil, check.Commentf(string(out))) + + err = s.d.Start("--graph", "/tmp/testfs-mount") c.Assert(err, check.IsNil) // pull a repository large enough to fill the mount point - out, err := s.d.Cmd("pull", "registry:2") - c.Assert(out, checker.Contains, "no space left on device") + pullOut, err := s.d.Cmd("pull", "registry:2") + c.Assert(err, checker.NotNil, check.Commentf(pullOut)) + c.Assert(pullOut, checker.Contains, "no space left on device") } // Test daemon restart with container links + auto restart |