Skip to content

Commit 769060e

Browse files
committed
tests: polish
1 parent 4fb1392 commit 769060e

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

Lib/test/test_concurrent_futures/executor.py

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,40 +72,41 @@ def test_map_timeout(self):
7272
self.assertEqual([None, None], results)
7373

7474
def test_map_with_buffersize(self):
75+
iterable = range(4)
7576
with self.assertRaisesRegex(ValueError, "buffersize must be None or >= 1."):
76-
self.executor.map(bool, [], buffersize=0)
77-
78-
it = range(4)
77+
self.executor.map(bool, iterable, buffersize=0)
78+
self.assertEqual(
79+
list(self.executor.map(str, iterable, buffersize=1)),
80+
list(map(str, iterable)),
81+
)
7982
self.assertEqual(
80-
list(self.executor.map(str, it, buffersize=1)),
81-
list(map(str, it)),
83+
list(self.executor.map(str, iterable, buffersize=2)),
84+
list(map(str, iterable)),
8285
)
8386

8487
def test_map_with_buffersize_and_timeout(self):
85-
it = self.executor.map(time.sleep, (0, 1), timeout=0.5)
86-
next(it)
88+
results = self.executor.map(time.sleep, (0, 1), timeout=0.5)
89+
next(results)
8790
with self.assertRaises(TimeoutError):
88-
next(it)
91+
next(results)
8992

9093
def test_map_with_buffersize_on_infinite_iterable(self):
9194
results = self.executor.map(str, itertools.count(1), buffersize=1)
9295
self.assertEqual(next(iter(results)), "1")
9396

9497
def test_map_with_buffersize_on_iterable_smaller_than_buffer(self):
95-
it = range(2)
96-
results = self.executor.map(str, it, buffersize=10)
97-
self.assertListEqual(list(results), list(map(str, it)))
98+
iterable = range(2)
99+
results = self.executor.map(str, iterable, buffersize=8)
100+
self.assertListEqual(list(results), list(map(str, iterable)))
98101

99102
def test_map_with_buffersize_on_empty_iterable(self):
100-
it = iter([])
101-
results = self.executor.map(str, it, buffersize=10)
103+
results = self.executor.map(str, [], buffersize=8)
102104
self.assertListEqual(list(results), [])
103105

104106
def test_map_with_buffersize_when_buffer_becomes_full(self):
105-
manager = multiprocessing.Manager()
106107
iterable = range(8)
107108
buffersize = 4
108-
buffered_results = manager.list()
109+
buffered_results = multiprocessing.Manager().list()
109110
self.executor.map(buffered_results.append, iterable, buffersize=buffersize)
110111
self.executor.shutdown(wait=True)
111112
self.assertSetEqual(

0 commit comments

Comments
 (0)