Skip to content

C
cpython
Kaydet (Commit) 47f17d01 authored tarafından Guido van Rossum's avatar Guido van Rossum
Dosyalara gözat
Seçenekler

Make test_marshal pass. There was a bizarre recursion limit exceeded error, 

caused by not closing a file.
üst d10b2dc4
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 98 deletions
Lib/test/test_marshal.py
Dosyayı görüntüle @ 47f17d01
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
from test import test_support from test import test_support
import marshal import marshal
...@@ -7,20 +6,33 @@ import sys ...@@ -7,20 +6,33 @@ import sys
import unittest import unittest
import os import os
class IntTestCase(unittest.TestCase): class HelperMixin:
def helper(self, sample, *extra):
new = marshal.loads(marshal.dumps(sample, *extra))
self.assertEqual(sample, new)
try:
f = open(test_support.TESTFN, "wb")
try:
marshal.dump(sample, f, *extra)
finally:
f.close()
f = open(test_support.TESTFN, "rb")
try:
new = marshal.load(f)
finally:
f.close()
self.assertEqual(sample, new)
finally:
test_support.unlink(test_support.TESTFN)
class IntTestCase(unittest.TestCase, HelperMixin):
def test_ints(self): def test_ints(self):
# Test the full range of Python ints. # Test the full range of Python ints.
n = sys.maxint n = sys.maxint
while n: while n:
for expected in (-n, n): for expected in (-n, n):
s = marshal.dumps(expected) self.helper(expected)
got = marshal.loads(s)
self.assertEqual(expected, got)
marshal.dump(expected, open(test_support.TESTFN, "wb"))
got = marshal.load( open(test_support.TESTFN, "rb"))
self.assertEqual(expected, got)
n = n >> 1 n = n >> 1
os.unlink(test_support.TESTFN)
def test_int64(self): def test_int64(self):
# Simulate int marshaling on a 64-bit box. This is most interesting if # Simulate int marshaling on a 64-bit box. This is most interesting if
...@@ -48,28 +60,16 @@ class IntTestCase(unittest.TestCase): ...@@ -48,28 +60,16 @@ class IntTestCase(unittest.TestCase):
def test_bool(self): def test_bool(self):
for b in (True, False): for b in (True, False):
new = marshal.loads(marshal.dumps(b)) self.helper(b)
self.assertEqual(b, new)
self.assertEqual(type(b), type(new))
marshal.dump(b, open(test_support.TESTFN, "wb"))
new = marshal.load(open(test_support.TESTFN, "rb"))
self.assertEqual(b, new)
self.assertEqual(type(b), type(new))
class FloatTestCase(unittest.TestCase): class FloatTestCase(unittest.TestCase, HelperMixin):
def test_floats(self): def test_floats(self):
# Test a few floats # Test a few floats
small = 1e-25 small = 1e-25
n = sys.maxint * 3.7e250 n = sys.maxint * 3.7e250
while n > small: while n > small:
for expected in (-n, n): for expected in (-n, n):
f = float(expected) self.helper(float(expected))
s = marshal.dumps(f)
got = marshal.loads(s)
self.assertEqual(f, got)
marshal.dump(f, open(test_support.TESTFN, "wb"))
got = marshal.load(open(test_support.TESTFN, "rb"))
self.assertEqual(f, got)
n /= 123.4567 n /= 123.4567
f = 0.0 f = 0.0
...@@ -85,57 +85,22 @@ class FloatTestCase(unittest.TestCase): ...@@ -85,57 +85,22 @@ class FloatTestCase(unittest.TestCase):
while n < small: while n < small:
for expected in (-n, n): for expected in (-n, n):
f = float(expected) f = float(expected)
self.helper(f)
s = marshal.dumps(f) self.helper(f, 1)
got = marshal.loads(s)
self.assertEqual(f, got)
s = marshal.dumps(f, 1)
got = marshal.loads(s)
self.assertEqual(f, got)
marshal.dump(f, open(test_support.TESTFN, "wb"))
got = marshal.load(open(test_support.TESTFN, "rb"))
self.assertEqual(f, got)
marshal.dump(f, open(test_support.TESTFN, "wb"), 1)
got = marshal.load(open(test_support.TESTFN, "rb"))
self.assertEqual(f, got)
n *= 123.4567 n *= 123.4567
os.unlink(test_support.TESTFN)
class StringTestCase(unittest.TestCase): class StringTestCase(unittest.TestCase, HelperMixin):
def test_unicode(self): def test_unicode(self):
for s in ["", "Andr Previn", "abc", " "*10000]: for s in ["", "Andr\xe8 Previn", "abc", " "*10000]:
new = marshal.loads(marshal.dumps(s)) self.helper(marshal.loads(marshal.dumps(s)))
self.assertEqual(s, new)
self.assertEqual(type(s), type(new))
marshal.dump(s, open(test_support.TESTFN, "wb"))
new = marshal.load(open(test_support.TESTFN, "rb"))
self.assertEqual(s, new)
self.assertEqual(type(s), type(new))
os.unlink(test_support.TESTFN)
def test_string(self): def test_string(self):
for s in ["", "Andr Previn", "abc", " "*10000]: for s in ["", "Andr\xe8 Previn", "abc", " "*10000]:
new = marshal.loads(marshal.dumps(s)) self.helper(s)
self.assertEqual(s, new)
self.assertEqual(type(s), type(new))
marshal.dump(s, open(test_support.TESTFN, "wb"))
new = marshal.load(open(test_support.TESTFN, "rb"))
self.assertEqual(s, new)
self.assertEqual(type(s), type(new))
os.unlink(test_support.TESTFN)
def test_buffer(self): def test_buffer(self):
for s in [b"", b"Andr\xe8 Previn", b"abc", b" "*10000]: for s in [b"", b"Andr\xe8 Previn", b"abc", b" "*10000]:
b = buffer(s) self.helper(buffer(s))
new = marshal.loads(marshal.dumps(b))
self.assertEqual(s, new)
marshal.dump(b, open(test_support.TESTFN, "wb"))
new = marshal.load(open(test_support.TESTFN, "rb"))
self.assertEqual(s, new)
os.unlink(test_support.TESTFN)
class ExceptionTestCase(unittest.TestCase): class ExceptionTestCase(unittest.TestCase):
def test_exceptions(self): def test_exceptions(self):
...@@ -148,7 +113,7 @@ class CodeTestCase(unittest.TestCase): ...@@ -148,7 +113,7 @@ class CodeTestCase(unittest.TestCase):
new = marshal.loads(marshal.dumps(co)) new = marshal.loads(marshal.dumps(co))
self.assertEqual(co, new) self.assertEqual(co, new)
class ContainerTestCase(unittest.TestCase): class ContainerTestCase(unittest.TestCase, HelperMixin):
d = {'astring': 'foo@bar.baz.spam', d = {'astring': 'foo@bar.baz.spam',
'afloat': 7283.43, 'afloat': 7283.43,
'anint': 2**20, 'anint': 2**20,
...@@ -156,45 +121,21 @@ class ContainerTestCase(unittest.TestCase): ...@@ -156,45 +121,21 @@ class ContainerTestCase(unittest.TestCase):
'alist': ['.zyx.41'], 'alist': ['.zyx.41'],
'atuple': ('.zyx.41',)*10, 'atuple': ('.zyx.41',)*10,
'aboolean': False, 'aboolean': False,
'aunicode': "Andr Previn" 'aunicode': "Andr\xe8 Previn"
} }
def test_dict(self): def test_dict(self):
new = marshal.loads(marshal.dumps(self.d)) self.helper(self.d)
self.assertEqual(self.d, new)
marshal.dump(self.d, open(test_support.TESTFN, "wb"))
new = marshal.load(open(test_support.TESTFN, "rb"))
self.assertEqual(self.d, new)
os.unlink(test_support.TESTFN)
def test_list(self): def test_list(self):
lst = list(self.d.items()) self.helper(list(self.d.items()))
new = marshal.loads(marshal.dumps(lst))
self.assertEqual(lst, new)
marshal.dump(lst, open(test_support.TESTFN, "wb"))
new = marshal.load(open(test_support.TESTFN, "rb"))
self.assertEqual(lst, new)
os.unlink(test_support.TESTFN)
def test_tuple(self): def test_tuple(self):
t = tuple(self.d.keys()) self.helper(tuple(self.d.keys()))
new = marshal.loads(marshal.dumps(t))
self.assertEqual(t, new)
marshal.dump(t, open(test_support.TESTFN, "wb"))
new = marshal.load(open(test_support.TESTFN, "rb"))
self.assertEqual(t, new)
os.unlink(test_support.TESTFN)
def test_sets(self): def test_sets(self):
for constructor in (set, frozenset): for constructor in (set, frozenset):
t = constructor(self.d.keys()) self.helper(constructor(self.d.keys()))
new = marshal.loads(marshal.dumps(t))
self.assertEqual(t, new)
self.assert_(isinstance(new, constructor))
self.assertNotEqual(id(t), id(new))
marshal.dump(t, open(test_support.TESTFN, "wb"))
new = marshal.load(open(test_support.TESTFN, "rb"))
self.assertEqual(t, new)
os.unlink(test_support.TESTFN)
class BugsTestCase(unittest.TestCase): class BugsTestCase(unittest.TestCase):
def test_bug_5888452(self): def test_bug_5888452(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment