From 45560493dea71fa95c6fc69858529ca64f43b5db Mon Sep 17 00:00:00 2001 From: Bitdeli Chef Date: Mon, 30 Sep 2013 08:58:11 +0000 Subject: [PATCH 1/2] Add a Bitdeli badge to README --- README.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.rst b/README.rst index d98c1dd09..956639ad1 100644 --- a/README.rst +++ b/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 + From b623b7253e4f7e79ad8b5a770b3d75246ad5e2f2 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 30 Sep 2013 22:14:09 +0200 Subject: [PATCH 2/2] Unit test fixed. --- tests/install_from_scratch.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/install_from_scratch.py b/tests/install_from_scratch.py index dfa94a2e4..4d6800cec 100644 --- a/tests/install_from_scratch.py +++ b/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)