From a116e1e34d59c6196e575e89b0aebad89c924819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Tue, 3 Jun 2014 13:35:38 +0000
Subject: [PATCH] Mailman: add unit tests, and adatp to recent code changes

---
 roles/mailman/files/pg-give-rights.py  | 9 ---------
 roles/mailman/files/post-update.sh     | 4 ++++
 roles/mailman/tasks/main.yml           | 7 +++++++
 roles/mailman/templates/settings.py.j2 | 7 ++++++-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/roles/mailman/files/pg-give-rights.py b/roles/mailman/files/pg-give-rights.py
index b1efc5b2a4..ea795f20fc 100755
--- a/roles/mailman/files/pg-give-rights.py
+++ b/roles/mailman/files/pg-give-rights.py
@@ -82,14 +82,5 @@ def main():
         settings_admin.DATABASES["default"]["NAME"],
     )
 
-    # HyperKitty unit test database
-    give_rights(
-        settings_admin.DATABASES["default"]["HOST"],
-        settings_admin.DATABASES["default"]["USER"],
-        settings_admin.DATABASES["default"]["PASSWORD"],
-        "test_" + settings_admin.DATABASES["default"]["NAME"],
-        settings_admin.DATABASES["default"]["NAME"] + "app",
-    )
-
 
 if __name__ == "__main__": main()
diff --git a/roles/mailman/files/post-update.sh b/roles/mailman/files/post-update.sh
index f04228f6cf..8276bd935c 100755
--- a/roles/mailman/files/post-update.sh
+++ b/roles/mailman/files/post-update.sh
@@ -24,6 +24,10 @@ $BASEDIR/bin/pg-give-rights.py
 # SELinux contexts
 restorecon -r "$BASEDIR"
 
+# Run unit tests
+django-admin test --pythonpath $CONFDIR --settings settings_test -P hyperkitty
+nose2 kittystore
+
 # Reload Apache to flush the python cache
 systemctl reload httpd
 # Restart Mailman3 since kittystore was updated
diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml
index 686f3dbad5..cbffd523d5 100644
--- a/roles/mailman/tasks/main.yml
+++ b/roles/mailman/tasks/main.yml
@@ -120,6 +120,13 @@
   tags:
   - config
 
+- name: install the hyperkitty settings test file
+  copy: src=settings_test.py
+        dest="{{ mailman_webui_confdir }}/settings_test.py"
+        owner=root group=root mode=0640
+  tags:
+  - config
+
 - name: install the hyperkitty urls file
   copy: src=urls.py
         dest="{{ mailman_webui_confdir }}/urls.py"
diff --git a/roles/mailman/templates/settings.py.j2 b/roles/mailman/templates/settings.py.j2
index 6364267a35..1146a64f5b 100644
--- a/roles/mailman/templates/settings.py.j2
+++ b/roles/mailman/templates/settings.py.j2
@@ -159,7 +159,7 @@ TEMPLATE_DIRS = (
 )
 
 AUTHENTICATION_BACKENDS = (
-    'social_auth.backends.browserid.BrowserIDBackend',
+    #'social_auth.backends.browserid.BrowserIDBackend', # replaced with django_browserid
     'hyperkitty.lib.fedora.FedoraBackend',
     'social_auth.backends.google.GoogleBackend',
     'social_auth.backends.yahoo.YahooBackend',
@@ -190,6 +190,11 @@ INSTALLED_APPS = (
     'postorius',
 )
 
+
+import django
+if django.VERSION[:2] < (1, 6):
+    TEST_RUNNER = 'discover_runner.DiscoverRunner'
+
 SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'
 
 REST_FRAMEWORK = {