new: Django 1.9 support thanks to Claude Paroz

Author: acdha

AUTHORS

@@ -108,3 +108,4 @@ Thanks to
       SearchQuerySet
     * Tadas Dailyda (@skirsdeda) for various patches
     * Craig de Stigter (@craigds) for a patch fixing concurrency issues when building UnifiedIndex
+    * Claude Paroz (@claudep) for Django 1.9 support

test_haystack/solr_tests/test_admin.py

@@ -6,6 +6,7 @@
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.test.utils import override_settings
+from django.core.urlresolvers import reverse
 
 from haystack import connections, reset_search_queries
 from haystack.utils.loading import UnifiedIndex
@@ -16,7 +17,7 @@
 
 @override_settings(DEBUG=True)
 class SearchModelAdminTestCase(TestCase):
-    fixtures = ['base_data', 'bulk_data.json']
+    fixtures = ['base_data.json', 'bulk_data.json']
 
     def setUp(self):
         super(SearchModelAdminTestCase, self).setUp()
@@ -70,7 +71,10 @@ def test_usage(self):
         self.assertIn(5, result_pks)
 
         # Make sure only changelist is affected.
-        resp = self.client.get('/admin/core/mockmodel/1/')
+        resp = self.client.get(reverse('admin:core_mockmodel_change', args=(1, )))
         self.assertEqual(resp.status_code, 200)
-        self.assertEqual(len(connections['solr'].queries), 3)
         self.assertEqual(resp.context['original'].id, 1)
+        self.assertTemplateUsed(resp, 'admin/change_form.html')
+
+        # The Solr query count should be unchanged:
+        self.assertEqual(len(connections['solr'].queries), 3)