diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-01-12 14:43:48 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-01-17 11:49:15 +0100 |
| commit | b119f4329c2a4878f1c72f4d25d193d080792f62 (patch) | |
| tree | 9ce167ad86124abbcd328b73760eb6e6dc288b63 /tests | |
| parent | 23c87874397a22ca80c0d6fa8648fb58ee3ab28a (diff) | |
Refs #29708 -- Removed PickleSerializer per deprecation timeline.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/defer_regress/tests.py | 27 | ||||
| -rw-r--r-- | tests/serializers/tests.py | 31 |
2 files changed, 3 insertions, 55 deletions
diff --git a/tests/defer_regress/tests.py b/tests/defer_regress/tests.py index 9f94d5fac1..33193e187a 100644 --- a/tests/defer_regress/tests.py +++ b/tests/defer_regress/tests.py @@ -1,11 +1,9 @@ from operator import attrgetter from django.contrib.contenttypes.models import ContentType -from django.contrib.sessions.backends.db import SessionStore from django.db import models from django.db.models import Count -from django.test import TestCase, ignore_warnings, override_settings -from django.utils.deprecation import RemovedInDjango50Warning +from django.test import TestCase from .models import ( Base, @@ -106,29 +104,6 @@ class DeferRegressionTest(TestCase): list(SimpleItem.objects.annotate(Count("feature")).only("name")), list ) - @ignore_warnings(category=RemovedInDjango50Warning) - @override_settings( - SESSION_SERIALIZER="django.contrib.sessions.serializers.PickleSerializer" - ) - def test_ticket_12163(self): - # Test for #12163 - Pickling error saving session with unsaved model - # instances. - SESSION_KEY = "2b1189a188b44ad18c35e1baac6ceead" - - item = Item() - item._deferred = False - s = SessionStore(SESSION_KEY) - s.clear() - s["item"] = item - s.save(must_create=True) - - s = SessionStore(SESSION_KEY) - s.modified = True - s.save() - - i2 = s["item"] - self.assertFalse(i2._deferred) - def test_ticket_16409(self): # Regression for #16409 - make sure defer() and only() work with annotate() self.assertIsInstance( diff --git a/tests/serializers/tests.py b/tests/serializers/tests.py index 3cc937d58d..41997c98fb 100644 --- a/tests/serializers/tests.py +++ b/tests/serializers/tests.py @@ -1,4 +1,3 @@ -import pickle from datetime import datetime from functools import partialmethod from io import StringIO @@ -6,12 +5,11 @@ from unittest import mock, skipIf from django.core import serializers from django.core.serializers import SerializerDoesNotExist -from django.core.serializers.base import PickleSerializer, ProgressBar +from django.core.serializers.base import ProgressBar from django.db import connection, transaction from django.http import HttpResponse from django.test import SimpleTestCase, override_settings, skipUnlessDBFeature -from django.test.utils import Approximate, ignore_warnings -from django.utils.deprecation import RemovedInDjango50Warning +from django.test.utils import Approximate from .models import ( Actor, @@ -487,31 +485,6 @@ class SerializersTransactionTestBase: self.assertEqual(art_obj.author.name, "Agnes") -class PickleSerializerTests(SimpleTestCase): - @ignore_warnings(category=RemovedInDjango50Warning) - def test_serializer_protocol(self): - serializer = PickleSerializer(protocol=3) - self.assertEqual(serializer.protocol, 3) - # If protocol is not provided, it defaults to pickle.HIGHEST_PROTOCOL - serializer = PickleSerializer() - self.assertEqual(serializer.protocol, pickle.HIGHEST_PROTOCOL) - - @ignore_warnings(category=RemovedInDjango50Warning) - def test_serializer_loads_dumps(self): - serializer = PickleSerializer() - test_data = "test data" - dump = serializer.dumps(test_data) - self.assertEqual(serializer.loads(dump), test_data) - - def test_serializer_warning(self): - msg = ( - "PickleSerializer is deprecated due to its security risk. Use " - "JSONSerializer instead." - ) - with self.assertRaisesMessage(RemovedInDjango50Warning, msg): - PickleSerializer() - - def register_tests(test_class, method_name, test_func, exclude=()): """ Dynamically create serializer tests to ensure that all registered |
