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

Merge pull request #10793 from ahmetalpbalkan/win-cli/TestExportContainerAndImportImage-fix 

integration-cli: use cmd.Stdin instead of cat/tee for TestExportContainerAndImportImage
This commit is contained in:
Jessie Frazelle 2015-02-16 10:11:47 -08:00
parent 546f481840 48d8757700
commit 7e9dd94376
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
integration-cli/docker_cli_export_import_test.go
View File

@ -1,9 +1,8 @@
package main
import (
"fmt"
"os"
"os/exec"
"strings"
"testing"
)
@ -23,15 +22,13 @@ func TestExportContainerAndImportImage(t *testing.T) {
t.Fatalf("output should've been a container id: %s %s ", cleanedContainerID, err)
}
exportCmdTemplate := `%v export %v > /tmp/testexp.tar`
exportCmdFinal := fmt.Sprintf(exportCmdTemplate, dockerBinary, cleanedContainerID)
exportCmd := exec.Command("bash", "-c", exportCmdFinal)
exportCmd := exec.Command(dockerBinary, "export", cleanedContainerID)
if out, _, err = runCommandWithOutput(exportCmd); err != nil {
t.Fatalf("failed to export container: %s, %v", out, err)
}
importCmdFinal := `cat /tmp/testexp.tar | docker import - repo/testexp:v1`
importCmd := exec.Command("bash", "-c", importCmdFinal)
importCmd := exec.Command(dockerBinary, "import", "-", "repo/testexp:v1")
importCmd.Stdin = strings.NewReader(out)
out, _, err = runCommandWithOutput(importCmd)
if err != nil {
t.Fatalf("failed to import image: %s, %v", out, err)
@ -47,8 +44,6 @@ func TestExportContainerAndImportImage(t *testing.T) {
deleteContainer(cleanedContainerID)
deleteImages("repo/testexp:v1")
os.Remove("/tmp/testexp.tar")
logDone("export - export a container")
logDone("import - import an image")
}