Merge branch '1.2.x'

tests/install_from_scratch.py

@@ -9,11 +9,11 @@ from modoboa.lib.sysutils import exec_cmd
 
 
 class DeployTest(unittest.TestCase):
-    dbtype = "postgres"
+    dbtype = "mysql"
     dbhost = "localhost"
     projname = "modoboa_test"
     dbuser = "travis"
-    dbpassword = "toto"
+    dbpassword = ""
 
     def setUp(self):
         self.workdir = tempfile.mkdtemp()
@@ -70,7 +70,6 @@ class DeployTest(unittest.TestCase):
             % (dburl, 'localhost', self.projname)
         )
         code, output = exec_cmd(cmd, cwd=self.workdir)
-        print output
         self.assertEqual(code, 0)