docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12446 from icecrime/please_go_away_testexp.tar 

Always remove testexp.tar test file
This commit is contained in:
Doug Davis 2015-04-17 01:58:29 -04:00
parent 24af878358 4e356ee410
commit 5207b3eb2b
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
integration-cli/docker_cli_export_import_test.go
View File

@ -9,21 +9,24 @@ import (
// export an image and try to import it into a new one // export an image and try to import it into a new one
func TestExportContainerAndImportImage(t *testing.T) { 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) out, _, err := runCommandWithOutput(runCmd)
if err != nil { if err != nil {
t.Fatal("failed to create a container", out, err) t.Fatal("failed to create a container", out, err)
} }
cleanedContainerID := strings.TrimSpace(out) inspectCmd := exec.Command(dockerBinary, "inspect", containerID)
inspectCmd := exec.Command(dockerBinary, "inspect", cleanedContainerID)
out, _, err = runCommandWithOutput(inspectCmd) out, _, err = runCommandWithOutput(inspectCmd)
if err != nil { 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 { if out, _, err = runCommandWithOutput(exportCmd); err != nil {
t.Fatalf("failed to export container: %s, %v", out, err) 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) 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") logDone("export - export/import a container/image")
} }
// Used to test output flag in the export command // Used to test output flag in the export command
func TestExportContainerWithOutputAndImportImage(t *testing.T) { 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) out, _, err := runCommandWithOutput(runCmd)
if err != nil { if err != nil {
t.Fatal("failed to create a container", out, err) t.Fatal("failed to create a container", out, err)
} }
cleanedContainerID := strings.TrimSpace(out) inspectCmd := exec.Command(dockerBinary, "inspect", containerID)
inspectCmd := exec.Command(dockerBinary, "inspect", cleanedContainerID)
out, _, err = runCommandWithOutput(inspectCmd) out, _, err = runCommandWithOutput(inspectCmd)
if err != nil { 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 { if out, _, err = runCommandWithOutput(exportCmd); err != nil {
t.Fatalf("failed to export container: %s, %v", out, err) 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) 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") logDone("export - export/import a container/image with output flag")
} }