[DRE-commits] [ruby-passenger] 01/03: Improve autopkgtests: Be more verbose in case of errors.

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository ruby-passenger.

commit e01126ed9f983c0050c911cea2125d7fc725f84a
Author: Felix Geyer <fgeyer at debian.org>
Date:   Wed Sep 10 10:55:15 2014 +0200

    Improve autopkgtests: Be more verbose in case of errors.
---
 debian/changelog    |  7 +++++++
 debian/tests/nodejs | 17 +++++++++++++++--
 debian/tests/rack   | 17 +++++++++++++++--
 debian/tests/wsgi   | 17 +++++++++++++++--
 4 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23193d3..2b629ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-passenger (4.0.50-2) UNRELEASED; urgency=medium
+
+  * Improve autopkgtests:
+    - Be more verbose in case of errors.
+
+ -- Felix Geyer <fgeyer at debian.org>  Wed, 10 Sep 2014 10:51:19 +0200
+
 ruby-passenger (4.0.50-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/tests/nodejs b/debian/tests/nodejs
index 3fec433..e72a460 100755
--- a/debian/tests/nodejs
+++ b/debian/tests/nodejs
@@ -26,5 +26,18 @@ chown -R www-data:www-data /var/www/testnodejs
 a2enmod passenger
 service apache2 reload
 
-output=`wget -O- http://localhost/testnodejs/ 2>/dev/null`
-test "$output" = "hello world"
+if ! output=`wget -O- http://localhost/testnodejs/ 2>/dev/null`; then
+  echo "wget failed, output was:"
+  echo "$output"
+  echo
+  echo "Retest:"
+  wget -O- http://localhost/testnodejs/
+  exit 1
+else
+  if [ "$output" != "hello world" ]; then
+    echo "output is wrong"
+    echo "got:      | $output |"
+    echo "expected: | hello world |"
+    exit 1
+  fi
+fi
diff --git a/debian/tests/rack b/debian/tests/rack
index 2d9d781..04e5dd0 100755
--- a/debian/tests/rack
+++ b/debian/tests/rack
@@ -24,5 +24,18 @@ chown -R www-data:www-data /var/www/testrack
 a2enmod passenger
 service apache2 reload
 
-output=`wget -O- http://localhost/testrack/ 2>/dev/null`
-test "$output" = "hello world"
+if ! output=`wget -O- http://localhost/testrack/ 2>/dev/null`; then
+  echo "wget failed, output was:"
+  echo "$output"
+  echo
+  echo "Retest:"
+  wget -O- http://localhost/testrack/
+  exit 1
+else
+  if [ "$output" != "hello world" ]; then
+    echo "output is wrong"
+    echo "got:      | $output |"
+    echo "expected: | hello world |"
+    exit 1
+  fi
+fi
diff --git a/debian/tests/wsgi b/debian/tests/wsgi
index fa4a75e..ee223a8 100755
--- a/debian/tests/wsgi
+++ b/debian/tests/wsgi
@@ -23,5 +23,18 @@ chown -R www-data:www-data /var/www/testwsgi
 a2enmod passenger
 service apache2 reload
 
-output=`wget -O- http://localhost/testwsgi/ 2>/dev/null`
-test "$output" = "hello world"
+if ! output=`wget -O- http://localhost/testwsgi/ 2>/dev/null`; then
+  echo "wget failed, output was:"
+  echo "$output"
+  echo
+  echo "Retest:"
+  wget -O- http://localhost/testwsgi/
+  exit 1
+else
+  if [ "$output" != "hello world" ]; then
+    echo "output is wrong"
+    echo "got:      | $output |"
+    echo "expected: | hello world |"
+    exit 1
+  fi
+fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-passenger.git