diff options
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/pickletester.py | 4 | ||||
| -rwxr-xr-x | Lib/test/test_array.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_deque.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_io.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_set.py | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py index bf25245bd1..bd0a3a4813 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -480,8 +480,8 @@ class AbstractPickleTests(unittest.TestCase): if have_unicode: def test_unicode(self): - endcases = [u'', u'<\\u>', u'<\\\\u1234>', u'<\n>', - u'<\\>', u'<\\\\U00012345>'] + endcases = [u'', u'<\\u>', u'<\\\u1234>', u'<\n>', + u'<\\>', u'<\\\U00012345>'] for proto in protocols: for u in endcases: p = self.dumps(u, proto) diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py index 2efbc7d677..2c4c2fdc9f 100755 --- a/Lib/test/test_array.py +++ b/Lib/test/test_array.py @@ -7,7 +7,7 @@ import unittest from test import test_support from weakref import proxy import array, cStringIO -from cPickle import loads, dumps +from cPickle import loads, dumps, HIGHEST_PROTOCOL class ArraySubclass(array.array): pass @@ -97,7 +97,7 @@ class BaseTest(unittest.TestCase): self.assertEqual(a, b) def test_pickle(self): - for protocol in (0, 1, 2): + for protocol in range(HIGHEST_PROTOCOL + 1): a = array.array(self.typecode, self.example) b = loads(dumps(a, protocol)) self.assertNotEqual(id(a), id(b)) @@ -112,7 +112,7 @@ class BaseTest(unittest.TestCase): self.assertEqual(type(a), type(b)) def test_pickle_for_empty_array(self): - for protocol in (0, 1, 2): + for protocol in range(HIGHEST_PROTOCOL + 1): a = array.array(self.typecode) b = loads(dumps(a, protocol)) self.assertNotEqual(id(a), id(b)) diff --git a/Lib/test/test_deque.py b/Lib/test/test_deque.py index 0b751d865c..0f0d09847e 100644 --- a/Lib/test/test_deque.py +++ b/Lib/test/test_deque.py @@ -373,7 +373,7 @@ class TestBasic(unittest.TestCase): def test_pickle(self): d = deque(xrange(200)) - for i in (0, 1, 2): + for i in range(pickle.HIGHEST_PROTOCOL + 1): s = pickle.dumps(d, i) e = pickle.loads(s) self.assertNotEqual(id(d), id(e)) @@ -382,7 +382,7 @@ class TestBasic(unittest.TestCase): ## def test_pickle_recursive(self): ## d = deque('abc') ## d.append(d) -## for i in (0, 1, 2): +## for i in range(pickle.HIGHEST_PROTOCOL + 1): ## e = pickle.loads(pickle.dumps(d, i)) ## self.assertNotEqual(id(d), id(e)) ## self.assertEqual(id(e), id(e[-1])) diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 8a7da60947..967018ea45 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -554,8 +554,9 @@ class BufferedRWPairTest(unittest.TestCase): r = MockRawIO(()) w = MockRawIO() pair = io.BufferedRWPair(r, w) + self.assertFalse(pair.closed) - # XXX need implementation + # XXX More Tests class BufferedRandomTest(unittest.TestCase): diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py index 499406f3c2..d38a675907 100644 --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -221,7 +221,7 @@ class TestJointOps(unittest.TestCase): self.failIf(set('cbs').issuperset('a')) def test_pickling(self): - for i in (0, 1, 2): + for i in range(pickle.HIGHEST_PROTOCOL + 1): p = pickle.dumps(self.s, i) dup = pickle.loads(p) self.assertEqual(self.s, dup, "%s != %s" % (self.s, dup)) |