From 8025657a3884478204ad6c5b70b5d39a564942f5 Mon Sep 17 00:00:00 2001
From: Michael Hobbs <mh@expa.com>
Date: Sun, 14 Dec 2014 15:31:46 -0800
Subject: [PATCH] save error in output if curl errors

---
 tests/apps/.websocket.disabled/check_deploy | 2 +-
 tests/apps/config/check_deploy              | 2 +-
 tests/apps/go/check_deploy                  | 2 +-
 tests/apps/java/check_deploy                | 2 +-
 tests/apps/multi/check_deploy               | 2 +-
 tests/apps/nodejs-express/check_deploy      | 2 +-
 tests/apps/php/check_deploy                 | 2 +-
 tests/apps/python-flask/check_deploy        | 2 +-
 tests/apps/static/check_deploy              | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/apps/.websocket.disabled/check_deploy b/tests/apps/.websocket.disabled/check_deploy
index ed70d38bf..e9f31bbd8 100755
--- a/tests/apps/.websocket.disabled/check_deploy
+++ b/tests/apps/.websocket.disabled/check_deploy
@@ -1,2 +1,2 @@
 #!/bin/bash
-set -e; output="$(curl -s -i -N -H \"Connection: Upgrade\" -H \"Upgrade: websocket\" -H \"Host: $1\" -H \"Origin: $1\" $1 -m 2)"; echo $output; test "$output" == "bazingaa"
\ No newline at end of file
+set -e; output="$(curl -s -S -i -N -H \"Connection: Upgrade\" -H \"Upgrade: websocket\" -H \"Host: $1\" -H \"Origin: $1\" $1 -m 2)"; echo $output; test "$output" == "bazingaa"
diff --git a/tests/apps/config/check_deploy b/tests/apps/config/check_deploy
index 9f539bf9d..f3d06521a 100755
--- a/tests/apps/config/check_deploy
+++ b/tests/apps/config/check_deploy
@@ -5,7 +5,7 @@ test_url () {
   path="$1"
   expected_output="$2"
   url="$base_url$path"
-  output="$(curl -s "$url")"
+  output="$(curl -s -S "$url")"
   echo "$output"
   test "$output" == "$expected_output"
 }
diff --git a/tests/apps/go/check_deploy b/tests/apps/go/check_deploy
index ec2a725de..5bd0d0056 100755
--- a/tests/apps/go/check_deploy
+++ b/tests/apps/go/check_deploy
@@ -1,2 +1,2 @@
 #!/bin/bash
-set -e; test "$(curl -s "$1")" == "go"
+set -e; test "$(curl -s -S "$1")" == "go"
diff --git a/tests/apps/java/check_deploy b/tests/apps/java/check_deploy
index f0dd8beb5..837b16b22 100755
--- a/tests/apps/java/check_deploy
+++ b/tests/apps/java/check_deploy
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-set -e; output="$(curl -s $1)"; echo $output; test "$output" == "Hello from Java!"
+set -e; output="$(curl -s -S $1)"; echo $output; test "$output" == "Hello from Java!"
diff --git a/tests/apps/multi/check_deploy b/tests/apps/multi/check_deploy
index c07594a6d..535b57847 100755
--- a/tests/apps/multi/check_deploy
+++ b/tests/apps/multi/check_deploy
@@ -1,2 +1,2 @@
 #!/bin/bash
-set -e; curl -s "$1" | grep -q "Heroku Multi Buildpack on Dokku"
+set -e; curl -s -S "$1" | grep -q "Heroku Multi Buildpack on Dokku"
diff --git a/tests/apps/nodejs-express/check_deploy b/tests/apps/nodejs-express/check_deploy
index ef07f38a9..8fb1205dd 100755
--- a/tests/apps/nodejs-express/check_deploy
+++ b/tests/apps/nodejs-express/check_deploy
@@ -1,2 +1,2 @@
 #!/bin/bash
-set -e; output="$(curl -s "$1")"; echo "$output"; test "$output" == "nodejs/express"
+set -e; output="$(curl -s -S "$1")"; echo "$output"; test "$output" == "nodejs/express"
diff --git a/tests/apps/php/check_deploy b/tests/apps/php/check_deploy
index 049d32714..cf440bd95 100755
--- a/tests/apps/php/check_deploy
+++ b/tests/apps/php/check_deploy
@@ -1,2 +1,2 @@
 #!/bin/bash
-set -e; output="$(curl -s "$1")"; echo "$output"; test "$output" == "<html><h3>php</h3></html>"
+set -e; output="$(curl -s -S "$1")"; echo "$output"; test "$output" == "<html><h3>php</h3></html>"
diff --git a/tests/apps/python-flask/check_deploy b/tests/apps/python-flask/check_deploy
index 15c23e5d4..ccb89fdbc 100755
--- a/tests/apps/python-flask/check_deploy
+++ b/tests/apps/python-flask/check_deploy
@@ -1,2 +1,2 @@
 #!/bin/bash
-set -e; output="$(curl -s "$1")"; echo "$output"; test "$output" == "python/flask"
+set -e; output="$(curl -s -S "$1")"; echo "$output"; test "$output" == "python/flask"
diff --git a/tests/apps/static/check_deploy b/tests/apps/static/check_deploy
index e98fa9965..02a24b846 100755
--- a/tests/apps/static/check_deploy
+++ b/tests/apps/static/check_deploy
@@ -1,2 +1,2 @@
 #!/bin/bash
-set -e; output="$(curl -s "$1")"; echo "$output"; test "$output" == "<html><h3>Static Page</h3></html>"
+set -e; output="$(curl -s -S "$1")"; echo "$output"; test "$output" == "<html><h3>Static Page</h3></html>"