From 0e2979e95d0f68f28c92c84c14655e7510d4e789 Mon Sep 17 00:00:00 2001 From: starryrbs <1322096624@qq.com> Date: Thu, 18 Feb 2021 00:04:59 +0800 Subject: [3.2.x] Fixed #32450 -- Fixed crash when ANDing/ORing an empty Q() with not pickleable Q(). Regression in bb0b6e526340e638522e093765e534df4e4393d2. Backport of 466920f6d726eee90d5566e0a9948e92b33a122e from master --- tests/queries/test_q.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tests') diff --git a/tests/queries/test_q.py b/tests/queries/test_q.py index 9adff07ef2..6dcf36ce02 100644 --- a/tests/queries/test_q.py +++ b/tests/queries/test_q.py @@ -8,6 +8,10 @@ class QTests(SimpleTestCase): self.assertEqual(q & Q(), q) self.assertEqual(Q() & q, q) + q = Q(x__in={}.keys()) + self.assertEqual(q & Q(), q) + self.assertEqual(Q() & q, q) + def test_combine_and_both_empty(self): self.assertEqual(Q() & Q(), Q()) @@ -16,6 +20,10 @@ class QTests(SimpleTestCase): self.assertEqual(q | Q(), q) self.assertEqual(Q() | q, q) + q = Q(x__in={}.keys()) + self.assertEqual(q | Q(), q) + self.assertEqual(Q() | q, q) + def test_combine_or_both_empty(self): self.assertEqual(Q() | Q(), Q()) -- cgit v1.3