Merge pull request #21634 from cpuguy83/add_beter_logging_for_TestDaemonNoSpaceleftOnDeviceError

More logs for `TestDaemonNoSpaceleftOnDeviceError`
This commit is contained in:
Vincent Demeester 2016-04-14 22:06:49 +02:00
commit 8011228b53
1 changed files with 16 additions and 15 deletions

View File

@ -1914,27 +1914,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