<NME> tests.py
<BEF> # coding: utf-8

import tempfile
import unittest

from modoboa.lib.sysutils import exec_cmd


class DeployTest(unittest.TestCase):
    dbtype = "postgres"
    dbhost = "localhost"
    projname = "modoboa_test"
    dbuser = "postgres"
    dbpassword = ""

    def setUp(self):
        self.workdir = tempfile.mkdtemp()
    projname = "modoboa_test"
    dbuser = DB == "mysql" and "modoboa" or "postgres"
    dbpassword = DB == "mysql" and "modoboa" or ""

    def setUp(self):
        self.workdir = tempfile.mkdtemp()

    def test_silent(self):
        dburl = "default:%s://%s:%s@%s:%s/%s" \
            % (self.dbtype, self.dbuser, self.dbpassword,
               self.dbhost, self.dbport, self.projname)
        cmd = (
            "modoboa-admin.py deploy --collectstatic "
            "--dburl %s --domain %s --admin-username admin %s"
            % (dburl, "localhost", self.projname)
        )
        code, output = exec_cmd(cmd, cwd=self.workdir)
        self.assertEqual(code, 0)


if __name__ == "__main__":
    unittest.main()

<MSG> Merge branch 'master' of github.com:tonioo/modoboa

<DFF> @@ -1,17 +1,19 @@
 # coding: utf-8
-
+import os
 import tempfile
 import unittest
 
 from modoboa.lib.sysutils import exec_cmd
 
+DB = os.environ.get("DB", "postgres")
+
 
 class DeployTest(unittest.TestCase):
-    dbtype = "postgres"
+    dbtype = DB.lower()
     dbhost = "localhost"
     projname = "modoboa_test"
-    dbuser = "postgres"
-    dbpassword = ""
+    dbuser = DB == "MYSQL" and "modoboa" or "postgres"
+    dbpassword = DB == "MYSQL" and "modoboa" or ""
 
     def setUp(self):
         self.workdir = tempfile.mkdtemp()

Merge branch 'master' of github.com:tonioo/modoboa