[pypy-svn] pypy collections-module: Kill the remainder of test_deque. It's good enough if we run

arigo commits-noreply at bitbucket.org
Tue Feb 15 20:55:25 CET 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: collections-module
Changeset: r42000:dd969966196b
Date: 2011-02-15 20:44 +0100
http://bitbucket.org/pypy/pypy/changeset/dd969966196b/

Log:	Kill the remainder of test_deque. It's good enough if we run lib-
	python/modified-2.7.0/test/test_deque.

diff --git a/pypy/module/_collections/test/test_deque.py b/pypy/module/_collections/test/test_deque.py
--- a/pypy/module/_collections/test/test_deque.py
+++ b/pypy/module/_collections/test/test_deque.py
@@ -303,138 +303,3 @@
         d.pop()
         gc.collect(); gc.collect(); gc.collect()
         assert X.freed
-
-class XXXXXXXXXTestVariousIteratorArgs:
-
-    def test_constructor(self):
-        for s in ("123", "", range(1000), ('do', 1.2), xrange(2000,2200,5)):
-            for g in (seq_tests.Sequence, seq_tests.IterFunc,
-                      seq_tests.IterGen, seq_tests.IterFuncStop,
-                      seq_tests.itermulti, seq_tests.iterfunc):
-                self.assertEqual(list(deque(g(s))), list(g(s)))
-            self.assertRaises(TypeError, deque, seq_tests.IterNextOnly(s))
-            self.assertRaises(TypeError, deque, seq_tests.IterNoNext(s))
-            self.assertRaises(ZeroDivisionError, deque, seq_tests.IterGenExc(s))
-
-    def test_iter_with_altered_data(self):
-        d = deque('abcdefg')
-        it = iter(d)
-        d.pop()
-        self.assertRaises(RuntimeError, it.next)
-
-    def test_runtime_error_on_empty_deque(self):
-        d = deque()
-        it = iter(d)
-        d.append(10)
-        self.assertRaises(RuntimeError, it.next)
-
-##class Deque(deque):
-##    pass
-
-##class DequeWithBadIter(deque):
-##    def __iter__(self):
-##        raise TypeError
-
-class XXXXXXXXXTestSubclass:
-
-    def test_basics(self):
-        d = Deque(xrange(25))
-        d.__init__(xrange(200))
-        for i in xrange(200, 400):
-            d.append(i)
-        for i in reversed(xrange(-200, 0)):
-            d.appendleft(i)
-        self.assertEqual(list(d), range(-200, 400))
-        self.assertEqual(len(d), 600)
-
-        left = [d.popleft() for i in xrange(250)]
-        self.assertEqual(left, range(-200, 50))
-        self.assertEqual(list(d), range(50, 400))
-
-        right = [d.pop() for i in xrange(250)]
-        right.reverse()
-        self.assertEqual(right, range(150, 400))
-        self.assertEqual(list(d), range(50, 150))
-
-        d.clear()
-        self.assertEqual(len(d), 0)
-
-    def test_copy_pickle(self):
-
-        d = Deque('abc')
-
-        e = d.__copy__()
-        self.assertEqual(type(d), type(e))
-        self.assertEqual(list(d), list(e))
-
-        e = Deque(d)
-        self.assertEqual(type(d), type(e))
-        self.assertEqual(list(d), list(e))
-
-        s = pickle.dumps(d)
-        e = pickle.loads(s)
-        self.assertNotEqual(id(d), id(e))
-        self.assertEqual(type(d), type(e))
-        self.assertEqual(list(d), list(e))
-
-        d = Deque('abcde', maxlen=4)
-
-        e = d.__copy__()
-        self.assertEqual(type(d), type(e))
-        self.assertEqual(list(d), list(e))
-
-        e = Deque(d)
-        self.assertEqual(type(d), type(e))
-        self.assertEqual(list(d), list(e))
-
-        s = pickle.dumps(d)
-        e = pickle.loads(s)
-        self.assertNotEqual(id(d), id(e))
-        self.assertEqual(type(d), type(e))
-        self.assertEqual(list(d), list(e))
-
-##    def test_pickle(self):
-##        d = Deque('abc')
-##        d.append(d)
-##
-##        e = pickle.loads(pickle.dumps(d))
-##        self.assertNotEqual(id(d), id(e))
-##        self.assertEqual(type(d), type(e))
-##        dd = d.pop()
-##        ee = e.pop()
-##        self.assertEqual(id(e), id(ee))
-##        self.assertEqual(d, e)
-##
-##        d.x = d
-##        e = pickle.loads(pickle.dumps(d))
-##        self.assertEqual(id(e), id(e.x))
-##
-##        d = DequeWithBadIter('abc')
-##        self.assertRaises(TypeError, pickle.dumps, d)
-
-    def test_weakref(self):
-        d = deque('gallahad')
-        p = weakref.proxy(d)
-        self.assertEqual(str(p), str(d))
-        d = None
-        test_support.gc_collect()
-        self.assertRaises(ReferenceError, str, p)
-
-    def test_strange_subclass(self):
-        class X(deque):
-            def __iter__(self):
-                return iter([])
-        d1 = X([1,2,3])
-        d2 = X([4,5,6])
-        d1 == d2   # not clear if this is supposed to be True or False,
-                   # but it used to give a SystemError
-
-
-##class SubclassWithKwargs(deque):
-##    def __init__(self, newarg=1):
-##        deque.__init__(self)
-
-class XXXXXXXXXTestSubclassWithKwargs:
-    def test_subclass_with_kwargs(self):
-        # SF bug #1486663 -- this used to erroneously raise a TypeError
-        SubclassWithKwargs(newarg=1)


More information about the Pypy-commit mailing list