new: support for newer versions of Whoosh

Author: acdha

setup.py

@@ -18,7 +18,7 @@
 tests_require = [
     'elasticsearch>=1.0.0,<2.0.0',
     'pysolr>=3.3.2',
-    'whoosh==2.5.4',
+    'whoosh>=2.5.4,<3.0',
     'python-dateutil',
     'geopy==0.95.1',
 

test_haystack/whoosh_tests/test_whoosh_backend.py

@@ -399,13 +399,17 @@ def test_build_schema(self):
 
         (content_field_name, schema) = self.sb.build_schema(ui.all_searchfields())
         self.assertEqual(content_field_name, 'text')
-        self.assertEqual(len(schema.names()), 9)
-        self.assertEqual(schema.names(), ['django_ct', 'django_id', 'id', 'is_active', 'name', 'pub_date', 'seen_count', 'sites', 'text'])
-        self.assertTrue(isinstance(schema._fields['text'], TEXT))
-        self.assertTrue(isinstance(schema._fields['pub_date'], DATETIME))
-        self.assertTrue(isinstance(schema._fields['seen_count'], NUMERIC))
-        self.assertTrue(isinstance(schema._fields['sites'], KEYWORD))
-        self.assertTrue(isinstance(schema._fields['is_active'], BOOLEAN))
+
+        schema_names = set(schema.names())
+        required_schema = {'django_ct', 'django_id', 'id', 'is_active', 'name', 'pub_date', 'seen_count',
+                           'sites', 'text'}
+        self.assertTrue(required_schema.issubset(schema_names))
+
+        self.assertIsInstance(schema._fields['text'], TEXT)
+        self.assertIsInstance(schema._fields['pub_date'], DATETIME)
+        self.assertIsInstance(schema._fields['seen_count'], NUMERIC)
+        self.assertIsInstance(schema._fields['sites'], KEYWORD)
+        self.assertIsInstance(schema._fields['is_active'], BOOLEAN)
 
     def test_verify_type(self):
         old_ui = connections['whoosh'].get_unified_index()