Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device

Add support for blkio.weight_device
Upstream-commit: 812a1c149a4a6db09eb59af29bed2713821e696e
Component: engine
This commit is contained in:
Vincent Demeester
2015-11-12 20:42:13 +01:00
21 changed files with 230 additions and 30 deletions
@@ -217,6 +217,12 @@ func (s *DockerSuite) TestRunWithBlkioInvalidWeight(c *check.C) {
c.Assert(out, checker.Contains, expected)
}
func (s *DockerSuite) TestRunWithBlkioInvalidWeightDevice(c *check.C) {
testRequires(c, blkioWeight)
out, _, err := dockerCmdWithError("run", "--blkio-weight-device", "/dev/sda:5", "busybox", "true")
c.Assert(err, check.NotNil, check.Commentf(out))
}
func (s *DockerSuite) TestRunOOMExitCode(c *check.C) {
testRequires(c, oomControl)
errChan := make(chan error)