From cc1a5548af3c9b0acaf9071dd4ef4544e8a2173a Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Tue, 2 Jun 2015 11:57:49 +0100
Subject: [PATCH] reduce smoke test noise

---
 test/620_proxy_entrypoint_command_test.sh | 2 +-
 test/config.sh                            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/620_proxy_entrypoint_command_test.sh b/test/620_proxy_entrypoint_command_test.sh
index d216077d..14a6a8ca 100755
--- a/test/620_proxy_entrypoint_command_test.sh
+++ b/test/620_proxy_entrypoint_command_test.sh
@@ -3,7 +3,7 @@
 . ./config.sh
 
 build_image() {
-    docker_on $HOST1 build -t $1 - <<- EOF
+    docker_on $HOST1 build -t $1 >/dev/null - <<- EOF
   FROM $SMALL_IMAGE
   ENTRYPOINT $2
   CMD $3
diff --git a/test/config.sh b/test/config.sh
index cc565fbe..7c2ada88 100644
--- a/test/config.sh
+++ b/test/config.sh
@@ -70,14 +70,14 @@ greenly() {
 run_on() {
     host=$1
     shift 1
-    greyly echo "Running on $host: $@" >&2
+    [ -z "$DEBUG" ] || greyly echo "Running on $host: $@" >&2
     remote $host $SSH $host "$@"
 }
 
 docker_on() {
     host=$1
     shift 1
-    greyly echo "Docker on $host:$DOCKER_PORT: $@" >&2
+    [ -z "$DEBUG" ] || greyly echo "Docker on $host:$DOCKER_PORT: $@" >&2
     docker -H tcp://$host:$DOCKER_PORT "$@"
 }
 
@@ -88,7 +88,7 @@ proxy() {
 weave_on() {
     host=$1
     shift 1
-    greyly echo "Weave on $host:$DOCKER_PORT: $@" >&2
+    [ -z "$DEBUG" ] || greyly echo "Weave on $host:$DOCKER_PORT: $@" >&2
     DOCKER_HOST=tcp://$host:$DOCKER_PORT $WEAVE "$@"
 }
 
@@ -145,7 +145,7 @@ assert_no_dns_record() {
 
 start_suite() {
     for host in $HOST1 $HOST2; do
-        echo "Cleaning up on $host: removing all containers and resetting weave"
+        [ -z "$DEBUG" ] || echo "Cleaning up on $host: removing all containers and resetting weave"
         containers=$(docker_on $host ps -aq 2>/dev/null)
         [ -n "$containers" ] && docker_on $host rm -f $containers >/dev/null 2>&1
         weave_on $host reset 2>/dev/null