summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-03-30 18:01:26 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-03-30 18:01:26 (GMT)
commit8dc2ec1513e90a8d23394f1c4ec3a07c4e057610 (patch)
tree9ab12f22a0ce6dd8a08a84aa7bd9c99fc21506db
parentfbb1c5ee068d209e33f6e15ecb4821d5d8b107fa (diff)
downloadcpython-8dc2ec1513e90a8d23394f1c4ec3a07c4e057610.zip
cpython-8dc2ec1513e90a8d23394f1c4ec3a07c4e057610.tar.gz
cpython-8dc2ec1513e90a8d23394f1c4ec3a07c4e057610.tar.bz2
Issue #26492: Added additional tests for exhausted iterators of mutable sequences.
-rw-r--r--Lib/test/list_tests.py11
-rw-r--r--Lib/test/test_bytes.py2
-rw-r--r--Lib/test/test_iter.py11
3 files changed, 24 insertions, 0 deletions
diff --git a/Lib/test/list_tests.py b/Lib/test/list_tests.py
index 1adfc75..f20fdc0 100644
--- a/Lib/test/list_tests.py
+++ b/Lib/test/list_tests.py
@@ -593,3 +593,14 @@ class CommonTest(seq_tests.CommonTest):
def __iter__(self):
raise KeyboardInterrupt
self.assertRaises(KeyboardInterrupt, list, F())
+
+ def test_exhausted_iterator(self):
+ a = self.type2test([1, 2, 3])
+ exhit = iter(a)
+ empit = iter(a)
+ for x in exhit: # exhaust the iterator
+ next(empit) # not exhausted
+ a.append(9)
+ self.assertEqual(list(exhit), [])
+ self.assertEqual(list(empit), [9])
+ self.assertEqual(a, self.type2test([1, 2, 3, 9]))
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 1bd3a1e..01ba5e5 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -17,6 +17,7 @@ import unittest
import test.support
import test.string_tests
import test.buffer_tests
+import test.list_tests
from test.support import bigaddrspacetest, MAX_Py_ssize_t
@@ -1323,6 +1324,7 @@ class ByteArrayTest(BaseBytesTest, unittest.TestCase):
b[:] = data
self.assertEqual(list(it), [])
+ test_exhausted_iterator = test.list_tests.CommonTest.test_exhausted_iterator
class AssortedBytesTest(unittest.TestCase):
#
diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py
index 54ddbaa..a91670b 100644
--- a/Lib/test/test_iter.py
+++ b/Lib/test/test_iter.py
@@ -190,6 +190,17 @@ class TestCase(unittest.TestCase):
self.assertTrue(isinstance(it, collections.abc.Iterator))
self.assertEqual(list(it), [])
+ def test_mutating_seq_class_exhausted_iter(self):
+ a = SequenceClass(5)
+ exhit = iter(a)
+ empit = iter(a)
+ for x in exhit: # exhaust the iterator
+ next(empit) # not exhausted
+ a.n = 7
+ self.assertEqual(list(exhit), [])
+ self.assertEqual(list(empit), [5, 6])
+ self.assertEqual(list(a), [0, 1, 2, 3, 4, 5, 6])
+
# Test a new_style class with __iter__ but no next() method
def test_new_style_iter_class(self):
class IterClass(object):