From 4e356ee410e1abb86665ab15e4c4155d7c807866 Mon Sep 17 00:00:00 2001 From: Arnaud Porterie Date: Thu, 16 Apr 2015 08:50:20 -0700 Subject: [PATCH] Improve export/import tests cleanup Signed-off-by: Arnaud Porterie --- .../docker_cli_export_import_test.go | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/integration-cli/docker_cli_export_import_test.go b/integration-cli/docker_cli_export_import_test.go index 2d03179ac6..3df8d60f86 100644 --- a/integration-cli/docker_cli_export_import_test.go +++ b/integration-cli/docker_cli_export_import_test.go @@ -9,21 +9,24 @@ import ( // export an image and try to import it into a new one func TestExportContainerAndImportImage(t *testing.T) { - runCmd := exec.Command(dockerBinary, "run", "-d", "busybox", "true") + containerID := "testexportcontainerandimportimage" + + defer deleteImages("repo/testexp:v1") + defer deleteContainer(containerID) + + runCmd := exec.Command(dockerBinary, "run", "-d", "--name", containerID, "busybox", "true") out, _, err := runCommandWithOutput(runCmd) if err != nil { t.Fatal("failed to create a container", out, err) } - cleanedContainerID := strings.TrimSpace(out) - - inspectCmd := exec.Command(dockerBinary, "inspect", cleanedContainerID) + inspectCmd := exec.Command(dockerBinary, "inspect", containerID) out, _, err = runCommandWithOutput(inspectCmd) if err != nil { - t.Fatalf("output should've been a container id: %s %s ", cleanedContainerID, err) + t.Fatalf("output should've been a container id: %s %s ", containerID, err) } - exportCmd := exec.Command(dockerBinary, "export", cleanedContainerID) + exportCmd := exec.Command(dockerBinary, "export", containerID) if out, _, err = runCommandWithOutput(exportCmd); err != nil { t.Fatalf("failed to export container: %s, %v", out, err) } @@ -42,29 +45,31 @@ func TestExportContainerAndImportImage(t *testing.T) { t.Fatalf("output should've been an image id: %s, %v", out, err) } - deleteContainer(cleanedContainerID) - deleteImages("repo/testexp:v1") - logDone("export - export/import a container/image") } // Used to test output flag in the export command func TestExportContainerWithOutputAndImportImage(t *testing.T) { - runCmd := exec.Command(dockerBinary, "run", "-d", "busybox", "true") + containerID := "testexportcontainerwithoutputandimportimage" + + defer deleteImages("repo/testexp:v1") + defer deleteContainer(containerID) + + runCmd := exec.Command(dockerBinary, "run", "-d", "--name", containerID, "busybox", "true") out, _, err := runCommandWithOutput(runCmd) if err != nil { t.Fatal("failed to create a container", out, err) } - cleanedContainerID := strings.TrimSpace(out) - - inspectCmd := exec.Command(dockerBinary, "inspect", cleanedContainerID) + inspectCmd := exec.Command(dockerBinary, "inspect", containerID) out, _, err = runCommandWithOutput(inspectCmd) if err != nil { - t.Fatalf("output should've been a container id: %s %s ", cleanedContainerID, err) + t.Fatalf("output should've been a container id: %s %s ", containerID, err) } - exportCmd := exec.Command(dockerBinary, "export", "--output=testexp.tar", cleanedContainerID) + defer os.Remove("testexp.tar") + + exportCmd := exec.Command(dockerBinary, "export", "--output=testexp.tar", containerID) if out, _, err = runCommandWithOutput(exportCmd); err != nil { t.Fatalf("failed to export container: %s, %v", out, err) } @@ -88,10 +93,5 @@ func TestExportContainerWithOutputAndImportImage(t *testing.T) { t.Fatalf("output should've been an image id: %s, %v", out, err) } - deleteContainer(cleanedContainerID) - deleteImages("repo/testexp:v1") - - os.Remove("/tmp/testexp.tar") - logDone("export - export/import a container/image with output flag") }