diff options
author | Tim Graham <timograham@gmail.com> | 2016-01-26 07:03:54 -0500 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2016-02-08 08:28:48 -0500 |
commit | 10a162809fa4de3a56bb7f2d3cb12b6b82a6f826 (patch) | |
tree | 1b1a345f17d01325db54ae14112c88aab0f82b25 /tests/model_regress | |
parent | db9f21f0ad29db860a10c1192933a79b0524ebc6 (diff) | |
download | django-10a162809fa4de3a56bb7f2d3cb12b6b82a6f826.tar.gz |
Refs #24007 -- Removed an apps.populate() call in model unpickling that can cause deadlocks.
Diffstat (limited to 'tests/model_regress')
-rw-r--r-- | tests/model_regress/test_pickle.py | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/tests/model_regress/test_pickle.py b/tests/model_regress/test_pickle.py index 393c53733b..bbbbb4cef0 100644 --- a/tests/model_regress/test_pickle.py +++ b/tests/model_regress/test_pickle.py @@ -1,17 +1,9 @@ -import datetime -import os import pickle -import subprocess -import sys -from django.core.files.temp import NamedTemporaryFile from django.db import DJANGO_VERSION_PICKLE_KEY, models -from django.test import TestCase, mock -from django.utils._os import npath, upath +from django.test import TestCase from django.utils.version import get_version -from .models import Article - class ModelPickleTestCase(TestCase): def test_missing_django_version_unpickling(self): @@ -51,41 +43,3 @@ class ModelPickleTestCase(TestCase): msg = "Pickled model instance's Django version 1.0 does not match the current version %s." % get_version() with self.assertRaisesMessage(RuntimeWarning, msg): pickle.loads(pickle.dumps(p)) - - def test_unpickling_when_appregistrynotready(self): - """ - #24007 -- Verifies that a pickled model can be unpickled without having - to manually setup the apps registry beforehand. - """ - script_template = """#!/usr/bin/env python -import pickle - -from django.conf import settings - -data = %r - -settings.configure(DEBUG=False, INSTALLED_APPS=['model_regress'], SECRET_KEY = "blah") -article = pickle.loads(data) -print(article.headline)""" - a = Article.objects.create( - headline="Some object", - pub_date=datetime.datetime.now(), - article_text="This is an article", - ) - - with NamedTemporaryFile(mode='w+', suffix=".py") as script: - script.write(script_template % pickle.dumps(a)) - script.flush() - # A path to model_regress must be set in PYTHONPATH - model_regress_dir = os.path.dirname(upath(__file__)) - model_regress_path = os.path.abspath(model_regress_dir) - tests_path = os.path.split(model_regress_path)[0] - pythonpath = os.environ.get('PYTHONPATH', '') - pythonpath = npath(os.pathsep.join([tests_path, pythonpath])) - - with mock.patch.dict('os.environ', {'PYTHONPATH': pythonpath}): - try: - result = subprocess.check_output([sys.executable, script.name]) - except subprocess.CalledProcessError: - self.fail("Unable to reload model pickled data") - self.assertEqual(result.strip().decode(), "Some object") |