Merge branch 'master' into refactoring

README.rst

@@ -65,3 +65,9 @@ The following external libraries are provided with Modoboa:
 .. |downloads| image:: https://pypip.in/d/modoboa/badge.png
    :alt: Downloads from Pypi
    :target: https://crate.io/packages/modoboa/
+
+
+.. image:: https://d2weczhvl823v0.cloudfront.net/tonioo/modoboa/trend.png
+   :alt: Bitdeli badge
+   :target: https://bitdeli.com/free
+

tests/install_from_scratch.py

@@ -15,6 +15,7 @@ def runcmd(cmd, **kwargs):
     output = p.communicate()[0]
     return p.returncode, output
 
+
 class DeployTest(unittest.TestCase):
     dbtype = "mysql"
     dbhost = "localhost"
@@ -42,7 +43,7 @@ class DeployTest(unittest.TestCase):
         child = pexpect.spawn(cmd, cwd=self.workdir)
         fout = open('install_from_scratch.log','w')
         child.logfile = fout
-        child.expect("Database type \(mysql or postgres\):", timeout=timeout)
+        child.expect("Database type \(mysql, postgres or sqlite3\):", timeout=timeout)
         child.sendline(self.dbtype)
         child.expect("Database host \(default: 'localhost'\):", timeout=timeout)
         child.sendline(self.dbhost)