From 337ee2aa63d54392321e2603c0f4e4f2f711dbc5 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Wed, 17 Feb 2016 18:18:18 +0100 Subject: [PATCH] integration-cli: use Devicemapper test requirement instead of checking strings Signed-off-by: Antonio Murdaca --- integration-cli/docker_cli_inspect_test.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/integration-cli/docker_cli_inspect_test.go b/integration-cli/docker_cli_inspect_test.go index b40d2d9a7b..9bf167d354 100644 --- a/integration-cli/docker_cli_inspect_test.go +++ b/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) { - 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")