From 3bd3996f72ca281cec288dd6e7f4fdaa0e1eeb00 Mon Sep 17 00:00:00 2001
From: Silvin Lubecki <silvin.lubecki@docker.com>
Date: Thu, 24 Jan 2019 17:53:42 +0100
Subject: [PATCH] Use gotest.tools/gotestsum binary to run unit and e2e tests
 and simplify the output.

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
---
 dockerfiles/Dockerfile.dev | 5 +++++
 dockerfiles/Dockerfile.e2e | 6 ++++++
 scripts/test/e2e/run       | 4 ++--
 scripts/test/unit          | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev
index af6da4b156..778cec876c 100644
--- a/dockerfiles/Dockerfile.dev
+++ b/dockerfiles/Dockerfile.dev
@@ -16,6 +16,11 @@ RUN     go get -d github.com/mjibson/esc && \
         go build -v -o /usr/bin/esc . && \
         rm -rf /go/src/* /go/pkg/* /go/bin/*
 
+ARG     GOTESTSUM_VERSION=0.3.2
+RUN     curl -Ls https://github.com/gotestyourself/gotestsum/releases/download/v${GOTESTSUM_VERSION}/gotestsum_${GOTESTSUM_VERSION}_linux_amd64.tar.gz -o gotestsum.tar.gz && \
+        tar -xf gotestsum.tar.gz gotestsum -C /usr/bin && \
+        rm gotestsum.tar.gz
+
 ENV     CGO_ENABLED=0 \
         PATH=$PATH:/go/src/github.com/docker/cli/build \
         DISABLE_WARN_OUTSIDE_CONTAINER=1
diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e
index eedda3b7f5..ccbcda2d6f 100644
--- a/dockerfiles/Dockerfile.e2e
+++ b/dockerfiles/Dockerfile.e2e
@@ -24,6 +24,12 @@ ARG NOTARY_VERSION=v0.6.1
 RUN curl -Ls https://github.com/theupdateframework/notary/releases/download/${NOTARY_VERSION}/notary-Linux-amd64 -o /usr/local/bin/notary \
     && chmod +x /usr/local/bin/notary
 
+ARG GOTESTSUM_VERSION=0.3.2
+RUN curl -Ls https://github.com/gotestyourself/gotestsum/releases/download/v${GOTESTSUM_VERSION}/gotestsum_${GOTESTSUM_VERSION}_linux_amd64.tar.gz -o gotestsum.tar.gz \
+    && tar -xf gotestsum.tar.gz gotestsum \
+    && mv gotestsum /usr/local/bin/gotestsum \
+    && rm gotestsum.tar.gz 
+
 ENV CGO_ENABLED=0 \
     DISABLE_WARN_OUTSIDE_CONTAINER=1 \
     PATH=/go/src/github.com/docker/cli/build:$PATH
diff --git a/scripts/test/e2e/run b/scripts/test/e2e/run
index d494019419..bdff2ce3e3 100755
--- a/scripts/test/e2e/run
+++ b/scripts/test/e2e/run
@@ -68,9 +68,9 @@ function runtests {
         TEST_REMOTE_DAEMON="${REMOTE_DAEMON-}" \
         TEST_SKIP_PLUGIN_TESTS="${SKIP_PLUGIN_TESTS-}" \
         GOPATH="$GOPATH" \
-        PATH="$PWD/build/:/usr/bin" \
+        PATH="$PWD/build/:/usr/bin:/usr/local/bin:/usr/local/go/bin" \
         DOCKER_CLI_E2E_PLUGINS_EXTRA_DIRS="$PWD/build/plugins-linux-amd64" \
-        "$(which go)" test -v ./e2e/... ${TESTFLAGS-}
+        "$(which gotestsum)" -- ./e2e/... ${TESTFLAGS-}
 }
 
 export unique_id="${E2E_UNIQUE_ID:-cliendtoendsuite}"
diff --git a/scripts/test/unit b/scripts/test/unit
index 7eb82d0ff0..6e0b6d5cba 100755
--- a/scripts/test/unit
+++ b/scripts/test/unit
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
 
-go test -v "$@"
+gotestsum -- "$@"