[DRE-commits] [redmine] 25/26: final touch in smoke tests

[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 a027ac2c97624c1975afc13ab12a6c867569a906
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Sep 14 14:37:34 2014 -0300

    final touch in smoke tests
---
 debian/tests/control    | 2 +-
 debian/tests/smoke-test | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index c8b38ca..1e94396 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -6,6 +6,6 @@ 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 mysql
+Test-Command: debian/tests/smoke-test mysql2
 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 338f160..7f1b94f 100755
--- a/debian/tests/smoke-test
+++ b/debian/tests/smoke-test
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-dbtype="${1:-sqlite3}"
+dbadapter="${1:-sqlite3}"
 
 exec 2>&1
 set -ex
 
-grep "adapter:[[:space:]]*$dbtype" /etc/redmine/default/database.yml
+grep "adapter:[[:space:]]*$dbadapter" /etc/redmine/default/database.yml
 
 tee /etc/apache2/sites-enabled/redmine.conf <<EOF
 <VirtualHost *:80>
@@ -21,7 +21,7 @@ tee /etc/apache2/sites-enabled/redmine.conf <<EOF
     Require all granted
   </Directory>
   ErrorLog /var/log/apache2/redmine.error.log
-  CustomLog ${APACHE_LOG_DIR}/redmine.access.log vhost_combined
+  CustomLog \${APACHE_LOG_DIR}/redmine.access.log vhost_combined
 </VirtualHost>
 EOF
 

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