summaryrefslogtreecommitdiff
path: root/integration-cli/docker_cli_images_test.go
diff options
context:
space:
mode:
authorJessica Frazelle <jess@docker.com>2014-10-14 14:07:30 -0700
committerJessica Frazelle <jess@docker.com>2014-10-16 15:06:20 -0700
commitdd248dee3c889fe376a89adcc9f9d19cafb9bf69 (patch)
tree29c2e8ef95d1e5893449628723704bd42e982d35 /integration-cli/docker_cli_images_test.go
parent50c3e7537c055a73a71999cb3ae9f2c6aa57efce (diff)
downloaddocker-dd248dee3c889fe376a89adcc9f9d19cafb9bf69.tar.gz
Cleanup errorOut resp in images tests
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Diffstat (limited to 'integration-cli/docker_cli_images_test.go')
-rw-r--r--integration-cli/docker_cli_images_test.go9
1 files changed, 6 insertions, 3 deletions
diff --git a/integration-cli/docker_cli_images_test.go b/integration-cli/docker_cli_images_test.go
index 5a7207cec5..ad06cb2eb8 100644
--- a/integration-cli/docker_cli_images_test.go
+++ b/integration-cli/docker_cli_images_test.go
@@ -1,7 +1,6 @@
package main
import (
- "fmt"
"os/exec"
"strings"
"testing"
@@ -11,7 +10,9 @@ import (
func TestImagesEnsureImageIsListed(t *testing.T) {
imagesCmd := exec.Command(dockerBinary, "images")
out, _, err := runCommandWithOutput(imagesCmd)
- errorOut(err, t, fmt.Sprintf("listing images failed with errors: %v", err))
+ if err != nil {
+ t.Fatalf("listing images failed with errors: %s, %v", out, err)
+ }
if !strings.Contains(out, "busybox") {
t.Fatal("images should've listed busybox")
@@ -46,7 +47,9 @@ func TestImagesOrderedByCreationDate(t *testing.T) {
}
out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "images", "-q", "--no-trunc"))
- errorOut(err, t, fmt.Sprintf("listing images failed with errors: %v", err))
+ if err != nil {
+ t.Fatalf("listing images failed with errors: %s, %v", out, err)
+ }
imgs := strings.Split(out, "\n")
if imgs[0] != id3 {
t.Fatalf("First image must be %s, got %s", id3, imgs[0])