From de90b6b7d850047280c3d80f9d36cc86a0876326 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 18 Nov 2014 21:09:51 +0100
Subject: [PATCH] Fix tests runner with django 1.6

---
 .travis.yml                    |  2 +-
 modoboa/templates/nlayout.html |  2 +-
 tests/install_from_scratch.py  | 20 ++++++++++++--------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9e4c369c7..318473a6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ python:
   - "2.7"
 
 env:
-  - DJANGO=1.5
+  - DJANGO=1.6
 
 install:
   - pip install -q Django==$DJANGO --use-mirrors
diff --git a/modoboa/templates/nlayout.html b/modoboa/templates/nlayout.html
index 3d82ffff9..e190d1e4a 100644
--- a/modoboa/templates/nlayout.html
+++ b/modoboa/templates/nlayout.html
@@ -61,7 +61,7 @@
     <script type="text/javascript" src="{% static 'moment/min/moment.min.js' %}"></script>
     <script src="{% static 'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js' %}" type="text/javascript"></script>
     <script src="{% static 'bootstrap-select/dist/js/bootstrap-select.min.js' %}" type="text/javascript"></script>
-    {% if LANGUAGE_CODE != "en" %}<script src="{{ STATIC_URL }}moment/locale/{{ LANGUAGE_CODE }}.js %}" type="text/javascript"></script>{% endif %}
+    {% if LANGUAGE_CODE != "en" %}<script src="{{ STATIC_URL }}moment/locale/{{ LANGUAGE_CODE }}.js" type="text/javascript"></script>{% endif %}
     {% if TEMPLATE_DEBUG %}
     <script src="//maxcdn.bootstrapcdn.com/bootlint/0.4.0/bootlint.min.js"></script>
     {% endif %}
diff --git a/tests/install_from_scratch.py b/tests/install_from_scratch.py
index 953467cc5..9b982715c 100644
--- a/tests/install_from_scratch.py
+++ b/tests/install_from_scratch.py
@@ -18,21 +18,25 @@ class DeployTest(unittest.TestCase):
     def setUp(self):
         self.workdir = tempfile.mkdtemp()
 
-    def tearDown(self): 
+    def tearDown(self):
         path = os.path.join(self.workdir, self.projname)
-        code, output = exec_cmd(
-            "python manage.py test core lib admin limits postfix_relay_domains"
-            " radicale postfix_autoreply",
-            capture_output=False,
-            cwd=path
+        extensions = [
+            "core", "lib", "admin", "limits", "postfix_relay_domains",
+            "radicale", "postfix_autoreply"
+        ]
+        cmd = "python manage.py test {0}".format(
+            ["modoboa.extensions.{0}".format(extension)
+             for extension in extensions]
         )
+        code, output = exec_cmd(cmd, capture_output=False, cwd=path)
         self.assertEqual(code, 0)
 
     def test_standard(self):
         timeout = 2
-        cmd = "modoboa-admin.py deploy --syncdb --collectstatic %s" % self.projname
+        cmd = "modoboa-admin.py deploy --syncdb --collectstatic {0}".format(
+            self.projname)
         child = pexpect.spawn(cmd, cwd=self.workdir)
-        fout = open('install_from_scratch.log','w')
+        fout = open('install_from_scratch.log', 'w')
         child.logfile = fout
         child.expect("Database type \(mysql, postgres or sqlite3\):", timeout=timeout)
         child.sendline(self.dbtype)