diff options
| author | Vincent Demeester <vincent@sbr.pm> | 2015-04-23 22:27:46 +0200 |
|---|---|---|
| committer | Vincent Demeester <vincent@sbr.pm> | 2015-04-23 22:27:46 +0200 |
| commit | c5ef2901d8190b687e847ab17d306dae5af37b42 (patch) | |
| tree | 9a5b9566fbdfa9dbb0255e355ffa0b32229820fd /integration-cli/docker_cli_cp_test.go | |
| parent | c4914f071ffad203bc4ed16404f7ddc985a5f63e (diff) | |
| download | docker-c5ef2901d8190b687e847ab17d306dae5af37b42.tar.gz | |
delete "defer deleteContainer" on tests
Since docker test suite is now using gocheck, ``defer
deleteContainer(…)`` is not needed anymore.
Fixes #12705
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat (limited to 'integration-cli/docker_cli_cp_test.go')
| -rw-r--r-- | integration-cli/docker_cli_cp_test.go | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/integration-cli/docker_cli_cp_test.go b/integration-cli/docker_cli_cp_test.go index 022b3cc9ea..26e778e4f2 100644 --- a/integration-cli/docker_cli_cp_test.go +++ b/integration-cli/docker_cli_cp_test.go @@ -32,7 +32,6 @@ func (s *DockerSuite) TestCpGarbagePath(c *check.C) { } cleanedContainerID := strings.TrimSpace(out) - defer deleteContainer(cleanedContainerID) out, _ = dockerCmd(c, "wait", cleanedContainerID) if strings.TrimSpace(out) != "0" { @@ -90,7 +89,6 @@ func (s *DockerSuite) TestCpRelativePath(c *check.C) { } cleanedContainerID := strings.TrimSpace(out) - defer deleteContainer(cleanedContainerID) out, _ = dockerCmd(c, "wait", cleanedContainerID) if strings.TrimSpace(out) != "0" { @@ -156,7 +154,6 @@ func (s *DockerSuite) TestCpAbsolutePath(c *check.C) { } cleanedContainerID := strings.TrimSpace(out) - defer deleteContainer(cleanedContainerID) out, _ = dockerCmd(c, "wait", cleanedContainerID) if strings.TrimSpace(out) != "0" { @@ -216,7 +213,6 @@ func (s *DockerSuite) TestCpAbsoluteSymlink(c *check.C) { } cleanedContainerID := strings.TrimSpace(out) - defer deleteContainer(cleanedContainerID) out, _ = dockerCmd(c, "wait", cleanedContainerID) if strings.TrimSpace(out) != "0" { @@ -276,7 +272,6 @@ func (s *DockerSuite) TestCpSymlinkComponent(c *check.C) { } cleanedContainerID := strings.TrimSpace(out) - defer deleteContainer(cleanedContainerID) out, _ = dockerCmd(c, "wait", cleanedContainerID) if strings.TrimSpace(out) != "0" { @@ -337,7 +332,6 @@ func (s *DockerSuite) TestCpUnprivilegedUser(c *check.C) { } cleanedContainerID := strings.TrimSpace(out) - defer deleteContainer(cleanedContainerID) out, _ = dockerCmd(c, "wait", cleanedContainerID) if strings.TrimSpace(out) != "0" { @@ -379,7 +373,6 @@ func (s *DockerSuite) TestCpSpecialFiles(c *check.C) { } cleanedContainerID := strings.TrimSpace(out) - defer deleteContainer(cleanedContainerID) out, _ = dockerCmd(c, "wait", cleanedContainerID) if strings.TrimSpace(out) != "0" { @@ -525,7 +518,6 @@ func (s *DockerSuite) TestCpToDot(c *check.C) { } cleanedContainerID := strings.TrimSpace(out) - defer deleteContainer(cleanedContainerID) out, _ = dockerCmd(c, "wait", cleanedContainerID) if strings.TrimSpace(out) != "0" { @@ -559,7 +551,6 @@ func (s *DockerSuite) TestCpToStdout(c *check.C) { } cID := strings.TrimSpace(out) - defer deleteContainer(cID) out, _ = dockerCmd(c, "wait", cID) if strings.TrimSpace(out) != "0" { @@ -588,7 +579,6 @@ func (s *DockerSuite) TestCpNameHasColon(c *check.C) { } cleanedContainerID := strings.TrimSpace(out) - defer deleteContainer(cleanedContainerID) out, _ = dockerCmd(c, "wait", cleanedContainerID) if strings.TrimSpace(out) != "0" { |