Merge pull request #1001 from ostcar/django1.6

Update to Django 1.6

openslides/global_settings.py

@@ -127,9 +127,6 @@ CACHES = {
     }
 }
 
-TEST_RUNNER = 'discover_runner.DiscoverRunner'
-TEST_DISCOVER_TOP_LEVEL = os.path.dirname(os.path.dirname(__file__))
-
 # Hosts/domain names that are valid for this site; required if DEBUG is False
 # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
 ALLOWED_HOSTS = ['*']

requirements.txt

@@ -4,7 +4,6 @@
 # Requirements for development and tests
 Fabric==1.8.0
 coverage==3.7
-django-discover-runner==1.0
 flake8==2.0
 mock==1.0.1
 

requirements_production.txt

@@ -1,4 +1,4 @@
-Django==1.5.4
+Django==1.6.0
 django-mptt==0.6.0
 reportlab==2.7
 pillow==2.2.1

tests/agenda/tests.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from django.db.models.query import EmptyQuerySet
 from django.test.client import Client
 
 from openslides.agenda.models import Item
@@ -29,7 +28,7 @@ class ItemTest(TestCase):
         self.assertFalse(self.item1.closed)
 
     def testParents(self):
-        self.assertEqual(type(self.item1.get_ancestors()), EmptyQuerySet)
+        self.assertFalse(self.item1.get_ancestors())
         self.assertTrue(self.item1 in self.item3.get_ancestors())
         self.assertTrue(self.item1 in self.item4.get_ancestors())
         self.assertFalse(self.item2 in self.item4.get_ancestors())