p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #20403 from runcom/use-test-req

Browse Source 
integration-cli: use Devicemapper test requirement instead of checkin…
Upstream-commit: 11257dc729546a61618c03009d510d8940afd897
Component: engine
This commit is contained in:
Alexander Morozov
2016-02-17 11:17:26 -08:00
parent 1653c5add2 be619004aa
commit d384741ec6
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/engine/integration-cli/docker_cli_inspect_test.go
View File

@ -166,16 +166,12 @@ func (s *DockerSuite) TestInspectContainerFilterInt(c *check.C) {
}
func (s *DockerSuite) TestInspectImageGraphDriver(c *check.C) {
testRequires(c, DaemonIsLinux)
testRequires(c, DaemonIsLinux, Devicemapper)
imageTest := "emptyfs"
name := inspectField(c, imageTest, "GraphDriver.Name")
checkValidGraphDriver(c, name)
if name != "devicemapper" {
c.Skip("requires devicemapper graphdriver")
}
deviceID := inspectField(c, imageTest, "GraphDriver.Data.DeviceId")
_, err := strconv.Atoi(deviceID)
@ -188,7 +184,8 @@ func (s *DockerSuite) TestInspectImageGraphDriver(c *check.C) {
}
func (s *DockerSuite) TestInspectContainerGraphDriver(c *check.C) {
testRequires(c, DaemonIsLinux)
testRequires(c, DaemonIsLinux, Devicemapper)
out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
out = strings.TrimSpace(out)
@ -196,10 +193,6 @@ func (s *DockerSuite) TestInspectContainerGraphDriver(c *check.C) {
checkValidGraphDriver(c, name)
if name != "devicemapper" {
return
}
imageDeviceID := inspectField(c, "busybox", "GraphDriver.Data.DeviceId")
deviceID := inspectField(c, out, "GraphDriver.Data.DeviceId")