Process DEFAULT values in mock side_effect that returns iterator.
Patch by Michael Ford.
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index 57bf957..073869a 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -904,6 +904,8 @@
result = next(effect)
if _is_exception(result):
raise result
+ if result is DEFAULT:
+ result = self.return_value
return result
ret_val = effect(*args, **kwargs)
diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py
index 2c6f128..3d0776c 100644
--- a/Lib/unittest/test/testmock/testmock.py
+++ b/Lib/unittest/test/testmock/testmock.py
@@ -906,6 +906,10 @@
self.assertRaises(StopIteration, mock)
self.assertIs(mock.side_effect, this_iter)
+ def test_side_effect_iterator_default(self):
+ mock = Mock(return_value=2)
+ mock.side_effect = iter([1, DEFAULT])
+ self.assertEqual([mock(), mock()], [1, 2])
def test_assert_has_calls_any_order(self):
mock = Mock()