p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed refs #24007 test on Windows.

This commit is contained in:
Tim Graham 2014-12-19 14:11:17 -05:00
parent 1d9fc5caa9
commit 995be4a137
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/model_regress/test_pickle.py
View File

@ -1,11 +1,12 @@
import datetime import datetime
import os
import pickle import pickle
import subprocess import subprocess
import sys import sys
import tempfile
import warnings import warnings
from django.db import models, DJANGO_VERSION_PICKLE_KEY from django.db import models, DJANGO_VERSION_PICKLE_KEY
from django.core.files.temp import NamedTemporaryFile
from django.test import TestCase from django.test import TestCase
from django.utils.encoding import force_text from django.utils.encoding import force_text
from django.utils.version import get_major_version, get_version from django.utils.version import get_major_version, get_version
@ -79,13 +80,18 @@ print(article.headline)"""
article_text="This is an article", article_text="This is an article",
) )
with tempfile.NamedTemporaryFile(mode='w+', suffix=".py", dir='.', delete=True) as script: with NamedTemporaryFile(mode='w+', suffix=".py", dir='.') as script:
script.write(script_template % pickle.dumps(a)) script.write(script_template % pickle.dumps(a))
script.flush() script.flush()
try: try:
result = subprocess.check_output( result = subprocess.check_output(
[sys.executable, script.name], [sys.executable, script.name],
env={'PYTHONPATH': ':'.join(sys.path)} env={
# Needed to run test outside of tests directory
str('PYTHONPATH'): os.pathsep.join(sys.path),
# Needed on Windows because http://bugs.python.org/issue8557
str('PATH'): os.environ['PATH'],
}
) )
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
self.fail("Unable to reload model pickled data") self.fail("Unable to reload model pickled data")