Browse Source

integration-cli: use Devicemapper test requirement instead of checking strings

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Antonio Murdaca 9 years ago
parent
commit
337ee2aa63
1 changed files with 3 additions and 10 deletions
  1. 3 10
      integration-cli/docker_cli_inspect_test.go

+ 3 - 10
integration-cli/docker_cli_inspect_test.go

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