Upgrade to Django 3.2 (#2056)

src/tests/api/test_idempotency.py

@@ -67,7 +67,7 @@ def test_scoped_by_key(token_client, organizer):
                              PAYLOAD, format='json', HTTP_X_IDEMPOTENCY_KEY='foo')
     assert resp.status_code == 201
     assert d1.data == json.loads(resp.content.decode())
-    assert d1._headers == resp._headers
+    assert d1.headers._store == resp.headers._store
     resp = token_client.post('/api/v1/organizers/{}/events/'.format(organizer.slug),
                              PAYLOAD, format='json', HTTP_X_IDEMPOTENCY_KEY='bar')
     assert resp.status_code == 400

src/tests/base/test_checkin.py

@@ -771,7 +771,7 @@ def test_rules_reasoning_prefer_number_over_date(event, position, clist):
 
 @pytest.mark.django_db(transaction=True)
 def test_position_queries(django_assert_num_queries, position, clist):
-    with django_assert_num_queries(11) as captured:
+    with django_assert_num_queries(12 if 'sqlite' in settings.DATABASES['default']['ENGINE'] else 11) as captured:
         perform_checkin(position, clist, {})
     if 'sqlite' not in settings.DATABASES['default']['ENGINE']:
         assert any('FOR UPDATE' in s['sql'] for s in captured)

src/tests/base/test_permissions.py

@@ -59,7 +59,7 @@ def admin():
 def admin_request(admin, client):
     factory = RequestFactory()
     r = factory.get('/')
-    SessionMiddleware().process_request(r)
+    SessionMiddleware(NotImplementedError).process_request(r)
     r.session.save()
     admin.staffsession_set.create(date_start=now(), session_key=r.session.session_key)
     admin.staffsession_set.create(date_start=now(), session_key=client.session.session_key)

src/tests/control/test_auth.py

@@ -33,7 +33,7 @@
 # License for the specific language governing permissions and limitations under the License.
 
 import time
-from datetime import date, timedelta
+from datetime import datetime, timedelta
 
 import pytest
 from django.conf import settings
@@ -526,8 +526,8 @@ class PasswordRecoveryFormTest(TestCase):
 
     def test_recovery_expired_token(self):
         class Mocked(PasswordResetTokenGenerator):
-            def _today(self):
-                return date.today() - timedelta(settings.PASSWORD_RESET_TIMEOUT_DAYS + 1)
+            def _now(self):
+                return datetime.now() - timedelta(seconds=settings.PASSWORD_RESET_TIMEOUT + 3600)
 
         generator = Mocked()
         token = generator.make_token(self.user)

src/tests/plugins/test_checkinlist.py

@@ -101,9 +101,6 @@ def test_csv_simple(event):
 
 @pytest.mark.django_db
 def test_csv_order_by_name_parts(event):  # noqa
-    from django.conf import settings
-    if not settings.JSON_FIELD_AVAILABLE:
-        raise pytest.skip("Not supported on this database")
     c = CSVCheckinList(event)
     _, _, content = c.render({
         'list': event.checkin_lists.first().pk,
@@ -142,10 +139,6 @@ def test_csv_order_by_name_parts(event):  # noqa
 
 @pytest.mark.django_db
 def test_csv_order_by_inherited_name_parts(event):  # noqa
-    from django.conf import settings
-    if not settings.JSON_FIELD_AVAILABLE:
-        raise pytest.skip("Not supported on this database")
-
     with scope(organizer=event.organizer):
         OrderPosition.objects.filter(attendee_name_cached__icontains="Andrea").delete()
         op = OrderPosition.objects.get()

src/tests/presale/test_checkoutflow.py

@@ -44,7 +44,7 @@ def event():
 def req_with_session():
     factory = RequestFactory()
     r = factory.get('/')
-    SessionMiddleware().process_request(r)
+    SessionMiddleware(NotImplementedError).process_request(r)
     r.session.save()
     return r