From 77ef164c1f9fe0526caa9956eada6360acf47ba5 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Tue, 14 Oct 2014 14:05:37 -0700 Subject: [PATCH] Cleanup errorOut resp in version tests Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) Upstream-commit: 50c3e7537c055a73a71999cb3ae9f2c6aa57efce Component: engine --- .../engine/integration-cli/docker_cli_version_test.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_version_test.go b/components/engine/integration-cli/docker_cli_version_test.go index 7f1838e5d9..bb9942593d 100644 --- a/components/engine/integration-cli/docker_cli_version_test.go +++ b/components/engine/integration-cli/docker_cli_version_test.go @@ -1,7 +1,6 @@ package main import ( - "fmt" "os/exec" "strings" "testing" @@ -10,11 +9,9 @@ import ( // ensure docker version works func TestVersionEnsureSucceeds(t *testing.T) { versionCmd := exec.Command(dockerBinary, "version") - out, exitCode, err := runCommandWithOutput(versionCmd) - errorOut(err, t, fmt.Sprintf("encountered error while running docker version: %v", err)) - - if err != nil || exitCode != 0 { - t.Fatal("failed to execute docker version") + out, _, err := runCommandWithOutput(versionCmd) + if err != nil { + t.Fatal("failed to execute docker version: %s, %v", out, err) } stringsToCheck := []string{