[DRE-commits] [redmine] 22/26: check for the database being used

[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 f02fe67c5489c444ac130c886282279ab25ed892
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Sep 14 13:51:00 2014 -0300

    check for the database being used
---
 debian/tests/control    | 16 ++++++++--------
 debian/tests/smoke-test |  4 ++++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index 220e8e9..4801728 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
+# Depends: redmine-sqlite, redmine, apache2, libapache2-mod-passenger, curl
+# Restrictions: needs-root
 
-Test-Command: debian/tests/smoke-test
-Depends: redmine-pgsql, redmine, apache2, libapache2-mod-passenger, curl
+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
+# Depends: redmine-mysql, redmine, apache2, libapache2-mod-passenger, curl
+# Restrictions: needs-root
diff --git a/debian/tests/smoke-test b/debian/tests/smoke-test
index bfe5d3a..8b20709 100755
--- a/debian/tests/smoke-test
+++ b/debian/tests/smoke-test
@@ -1,8 +1,12 @@
 #!/bin/sh
 
+dbtype="${1:-sqlite3}"
+
 exec 2>&1
 set -e
 
+grep "adapter:[[:space:]]*$dbtype" /etc/redmine/default/database.yml
+
 cat > /etc/apache2/sites-enabled/redmine.conf <<EOF
 <VirtualHost *:80>
   ServerName localhost

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