summaryrefslogtreecommitdiff
path: root/integration-cli/docker_cli_save_load_test.go
diff options
context:
space:
mode:
authorSrini Brahmaroutu <srbrahma@us.ibm.com>2015-02-24 18:33:18 +0000
committerSrini Brahmaroutu <srbrahma@us.ibm.com>2015-11-14 03:16:45 +0000
commitb1cc78b8f5d0c85c80c04a15fa791025ae7d22e6 (patch)
tree6d7156fb76401b0ecc56e315bb306597d2802dbb /integration-cli/docker_cli_save_load_test.go
parent13963957ebadc663915aed8c61451a93db41c27c (diff)
downloaddocker-b1cc78b8f5d0c85c80c04a15fa791025ae7d22e6.tar.gz
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Power and Z.
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Diffstat (limited to 'integration-cli/docker_cli_save_load_test.go')
-rw-r--r--integration-cli/docker_cli_save_load_test.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/integration-cli/docker_cli_save_load_test.go b/integration-cli/docker_cli_save_load_test.go
index fff0a2891f..673d3a94a8 100644
--- a/integration-cli/docker_cli_save_load_test.go
+++ b/integration-cli/docker_cli_save_load_test.go
@@ -131,8 +131,11 @@ func (s *DockerSuite) TestSaveImageId(c *check.C) {
c.Assert(tarCmd.Start(), checker.IsNil, check.Commentf("tar failed with error: %v", err))
c.Assert(saveCmd.Start(), checker.IsNil, check.Commentf("docker save failed with error: %v", err))
- defer saveCmd.Wait()
- defer tarCmd.Wait()
+ defer func() {
+ saveCmd.Wait()
+ tarCmd.Wait()
+ dockerCmd(c, "rmi", repoName)
+ }()
out, _, err = runCommandWithOutput(grepCmd)