mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
c7bec92891
Since `cirros.tar.gz` only existed to test `docker import`'s display and presence in `docker events`, we can instead just use `docker export` piped directly to `docker import` to achieve the same goal without another external dependency besides `busybox` (which we already have). While I was at it, I updated `TestImportDisplay` to also test that the imported image actually runs successfully as well (so we're testing the full import round-trip). Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
43 lines
1.1 KiB
Go
43 lines
1.1 KiB
Go
package main
|
|
|
|
import (
|
|
"os/exec"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func TestImportDisplay(t *testing.T) {
|
|
runCmd := exec.Command(dockerBinary, "run", "-d", "busybox", "true")
|
|
out, _, err := runCommandWithOutput(runCmd)
|
|
if err != nil {
|
|
t.Fatal("failed to create a container", out, err)
|
|
}
|
|
cleanedContainerID := stripTrailingCharacters(out)
|
|
defer deleteContainer(cleanedContainerID)
|
|
|
|
out, _, err = runCommandPipelineWithOutput(
|
|
exec.Command(dockerBinary, "export", cleanedContainerID),
|
|
exec.Command(dockerBinary, "import", "-"),
|
|
)
|
|
if err != nil {
|
|
t.Errorf("import failed with errors: %v, output: %q", err, out)
|
|
}
|
|
|
|
if n := strings.Count(out, "\n"); n != 1 {
|
|
t.Fatalf("display is messed up: %d '\\n' instead of 1:\n%s", n, out)
|
|
}
|
|
image := strings.TrimSpace(out)
|
|
defer deleteImages(image)
|
|
|
|
runCmd = exec.Command(dockerBinary, "run", "--rm", image, "true")
|
|
out, _, err = runCommandWithOutput(runCmd)
|
|
if err != nil {
|
|
t.Fatal("failed to create a container", out, err)
|
|
}
|
|
|
|
if out != "" {
|
|
t.Fatalf("command output should've been nothing, was %q", out)
|
|
}
|
|
|
|
logDone("import - display is fine, imported image runs")
|
|
}
|