[DRE-commits] [redmine] 23/26: re-enable smoke test against sqlite3 and mysql

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository redmine.

commit ffa9d260607b6b477b9e5992d80c68831255c017
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Sep 14 13:55:29 2014 -0300

    re-enable smoke test against sqlite3 and mysql
---
 debian/tests/control    | 12 ++++++------
 debian/tests/smoke-test |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 4801728..c8b38ca 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,11 +1,11 @@
-# Test-Command: debian/tests/smoke-test
-# Depends: redmine-sqlite, redmine, apache2, libapache2-mod-passenger, curl
-# Restrictions: needs-root
+Test-Command: debian/tests/smoke-test sqlite3
+Depends: redmine-sqlite, redmine, apache2, libapache2-mod-passenger, curl
+Restrictions: needs-root
 
 Test-Command: debian/tests/smoke-test postgresql
 Depends: postgresql, redmine-pgsql, redmine, apache2, libapache2-mod-passenger, curl
 Restrictions: needs-root
 
-# Test-Command: debian/tests/smoke-test
-# Depends: redmine-mysql, redmine, apache2, libapache2-mod-passenger, curl
-# Restrictions: needs-root
+Test-Command: debian/tests/smoke-test mysql
+Depends: mysql-server, redmine-mysql, redmine, apache2, libapache2-mod-passenger, curl
+Restrictions: needs-root
diff --git a/debian/tests/smoke-test b/debian/tests/smoke-test
index 8b20709..338f160 100755
--- a/debian/tests/smoke-test
+++ b/debian/tests/smoke-test
@@ -3,11 +3,11 @@
 dbtype="${1:-sqlite3}"
 
 exec 2>&1
-set -e
+set -ex
 
 grep "adapter:[[:space:]]*$dbtype" /etc/redmine/default/database.yml
 
-cat > /etc/apache2/sites-enabled/redmine.conf <<EOF
+tee /etc/apache2/sites-enabled/redmine.conf <<EOF
 <VirtualHost *:80>
   ServerName localhost
   RailsEnv production

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