ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Selectively re-enable framing tests

Browse source
This commit is contained in:
Antoine Pitrou 2013-11-24 14:33:37 +01:00
parent dc6aaec9e3
commit 3ab9cfc501
2 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Lib/test/pickletester.py
View file

@ -438,6 +438,8 @@ def create_data():
class AbstractPickleTests(unittest.TestCase):
# Subclass must define self.dumps, self.loads.
optimized = False
_testdata = create_data()
def setUp(self):
@ -1334,13 +1336,16 @@ class AbstractPickleTests(unittest.TestCase):
self.assertEqual(obj, unpickled)
# Test the framing heuristic is sane,
# assuming a given frame size target.
# XXX Assumptions here are wrong when the pickle are optimized
# bytes_per_frame = (len(pickled) /
# count_opcode(pickle.FRAME, pickled))
# self.assertGreater(bytes_per_frame,
# self.FRAME_SIZE_TARGET / 2)
# self.assertLessEqual(bytes_per_frame,
# self.FRAME_SIZE_TARGET * 1)
if self.optimized:
# These assumptions are currently invalid for optimized
# pickles (see e.g. issue19754).
continue
bytes_per_frame = (len(pickled) /
count_opcode(pickle.FRAME, pickled))
self.assertGreater(bytes_per_frame,
self.FRAME_SIZE_TARGET / 2)
self.assertLessEqual(bytes_per_frame,
self.FRAME_SIZE_TARGET * 1)
def test_framing_large_objects(self):
N = 1024 * 1024
@ -1350,10 +1355,13 @@ class AbstractPickleTests(unittest.TestCase):
pickled = self.dumps(obj, proto)
unpickled = self.loads(pickled)
self.assertEqual(obj, unpickled)
# At least one frame was emitted per large bytes object.
# XXX Assumptions here are wrong when the pickle are optimized
# n_frames = count_opcode(pickle.FRAME, pickled)
# self.assertGreaterEqual(n_frames, len(obj))
n_frames = count_opcode(pickle.FRAME, pickled)
if self.optimized:
# At least one frame was emitted (see issue19754).
self.assertGreaterEqual(n_frames, 1)
else:
# At least one frame was emitted per large bytes object.
self.assertGreaterEqual(n_frames, len(obj))
def test_optional_frames(self):
if pickle.HIGHEST_PROTOCOL < 4:

2
Lib/test/test_pickletools.py
View file

@ -6,6 +6,8 @@ from test.pickletester import AbstractPickleModuleTests
class OptimizedPickleTests(AbstractPickleTests, AbstractPickleModuleTests):
optimized = True
def dumps(self, arg, proto=None):
return pickletools.optimize(pickle.dumps(arg, proto))