Merge pull request #13489 from cpuguy83/cleanup_rm_funcs

Cleanup container rm funcs Upstream-commit: de318d8c1d980066db8e94825d0529698095536c Component: engine
2015-05-26 14:24:02 -07:00
parent 5066df6b7c 2b42c2c199
commit 96fc5c8d8e
3 changed files with 22 additions and 46 deletions
@@ -435,7 +435,6 @@ func (s *DockerSuite) TestCpVolumePath(c *check.C) {
 	}

 	cleanedContainerID := strings.TrimSpace(out)
-	defer dockerCmd(c, "rm", "-fv", cleanedContainerID)

 	out, _ = dockerCmd(c, "wait", cleanedContainerID)
 	if strings.TrimSpace(out) != "0" {